devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

Codecs: mp4: Reuse lookup_table index from seek in m4a_check_sample_offset

Browse source 
Change-Id: If2fc3038ce8db8ddf2991406a5cce294a857eadc
This commit is contained in:
roman.artiukhin 2023-09-18 13:14:47 +03:00 • committed by Solomon Peachy
parent ef7d6009b4
commit 001a338e51
4 changed files with 12 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

5
lib/rbcodec/codecs/aac.c
View file

@ -138,7 +138,7 @@ enum codec_status codec_run(void)
* upsampling files the resulting sound_samples_done must be expanded * upsampling files the resulting sound_samples_done must be expanded
* by a factor of 2. This is done via using sbr_fac. */ * by a factor of 2. This is done via using sbr_fac. */
if (m4a_seek_raw(&demux_res, &input_stream, file_offset, if (m4a_seek_raw(&demux_res, &input_stream, file_offset,
&sound_samples_done, (int*) &i)) { &sound_samples_done, (int*) &i, &seek_idx)) {
sound_samples_done *= sbr_fac; sound_samples_done *= sbr_fac;
} else { } else {
sound_samples_done = 0; sound_samples_done = 0;
@ -173,11 +173,10 @@ enum codec_status codec_run(void)
* by a factor 2. This is done via using sbr_fac. */ * by a factor 2. This is done via using sbr_fac. */
if (m4a_seek(&demux_res, &input_stream, if (m4a_seek(&demux_res, &input_stream,
(uint64_t) param * ci->id3->frequency / sbr_fac / 1000ULL, (uint64_t) param * ci->id3->frequency / sbr_fac / 1000ULL,
&sound_samples_done, (int*) &i)) { &sound_samples_done, (int*) &i, &seek_idx)) {
sound_samples_done *= sbr_fac; sound_samples_done *= sbr_fac;
elapsed_time = sound_samples_done * 1000LL / ci->id3->frequency; elapsed_time = sound_samples_done * 1000LL / ci->id3->frequency;
ci->set_elapsed(elapsed_time); ci->set_elapsed(elapsed_time);
seek_idx = 0;
if (i == 0) if (i == 0)
{ {

7
lib/rbcodec/codecs/alac.c
View file

@ -64,6 +64,7 @@ enum codec_status codec_run(void)
unsigned long resume_time; unsigned long resume_time;
uint32_t resume_offset; uint32_t resume_offset;
unsigned int did_resume; unsigned int did_resume;
int lookup_table_idx = 0;
/* Clean and initialize decoder structures */ /* Clean and initialize decoder structures */
memset(&demux_res , 0, sizeof(demux_res)); memset(&demux_res , 0, sizeof(demux_res));
@ -96,10 +97,10 @@ enum codec_status codec_run(void)
if (resume_time) if (resume_time)
did_resume = m4a_seek(&demux_res, &input_stream, did_resume = m4a_seek(&demux_res, &input_stream,
(uint64_t)resume_time * ci->id3->frequency / 1000ULL, (uint64_t)resume_time * ci->id3->frequency / 1000ULL,
&samplesdone, (int *) &i); &samplesdone, (int *) &i, &lookup_table_idx);
else if (resume_offset) else if (resume_offset)
did_resume = m4a_seek_raw(&demux_res, &input_stream, resume_offset, did_resume = m4a_seek_raw(&demux_res, &input_stream, resume_offset,
&samplesdone, (int *) &i); &samplesdone, (int *) &i, &lookup_table_idx);
else else
did_resume = 0; did_resume = 0;
@ -122,7 +123,7 @@ enum codec_status codec_run(void)
if (action == CODEC_ACTION_SEEK_TIME) { if (action == CODEC_ACTION_SEEK_TIME) {
if (m4a_seek(&demux_res, &input_stream, if (m4a_seek(&demux_res, &input_stream,
(uint64_t)param * ci->id3->frequency / 1000ULL, (uint64_t)param * ci->id3->frequency / 1000ULL,
&samplesdone, (int *) &i)) &samplesdone, (int *) &i, &lookup_table_idx))
set_elapsed_samples(samplesdone); set_elapsed_samples(samplesdone);
ci->seek_complete(); ci->seek_complete();

6
lib/rbcodec/codecs/libm4a/m4a.c
View file

@ -141,7 +141,7 @@ int m4a_check_sample_offset(demux_res_t *demux_res, uint32_t frame, uint32_t *st
* sound_samples_done and current_sample), 0 if failed. */ * sound_samples_done and current_sample), 0 if failed. */
unsigned int m4a_seek(demux_res_t* demux_res, stream_t* stream, unsigned int m4a_seek(demux_res_t* demux_res, stream_t* stream,
uint64_t sound_sample_loc, uint64_t* sound_samples_done, uint64_t sound_sample_loc, uint64_t* sound_samples_done,
int* current_sample) int* current_sample, int* lookup_table_idx)
{ {
uint32_t i, sample_i; uint32_t i, sample_i;
uint32_t time, time_cnt, time_dur; uint32_t time, time_cnt, time_dur;
@ -189,6 +189,7 @@ unsigned int m4a_seek(demux_res_t* demux_res, stream_t* stream,
/* The preceding chunk is the one that contains 'sample_i'. */ /* The preceding chunk is the one that contains 'sample_i'. */
chunk--; chunk--;
*lookup_table_idx = chunk;
chunk_first_sample = tco_tab[chunk].sample; chunk_first_sample = tco_tab[chunk].sample;
offset = tco_tab[chunk].offset; offset = tco_tab[chunk].offset;
@ -265,7 +266,7 @@ unsigned int m4a_seek(demux_res_t* demux_res, stream_t* stream,
*/ */
unsigned int m4a_seek_raw(demux_res_t* demux_res, stream_t* stream, unsigned int m4a_seek_raw(demux_res_t* demux_res, stream_t* stream,
uint32_t file_loc, uint64_t* sound_samples_done, uint32_t file_loc, uint64_t* sound_samples_done,
int* current_sample) int* current_sample, int* lookup_table_idx)
{ {
uint32_t i; uint32_t i;
uint32_t chunk_sample = 0; uint32_t chunk_sample = 0;
@ -283,6 +284,7 @@ unsigned int m4a_seek_raw(demux_res_t* demux_res, stream_t* stream,
break; break;
} }
i = (i>0) ? i-1 : 0; /* We want the last chunk _before_ file_loc. */ i = (i>0) ? i-1 : 0; /* We want the last chunk _before_ file_loc. */
*lookup_table_idx = i;
chunk_sample = demux_res->lookup_table[i].sample; chunk_sample = demux_res->lookup_table[i].sample;
new_pos = demux_res->lookup_table[i].offset; new_pos = demux_res->lookup_table[i].offset;

4
lib/rbcodec/codecs/libm4a/m4a.h
View file

@ -131,9 +131,9 @@ void stream_create(stream_t *stream,struct codec_api* ci);
unsigned int get_sample_offset(demux_res_t *demux_res, uint32_t sample); unsigned int get_sample_offset(demux_res_t *demux_res, uint32_t sample);
unsigned int m4a_seek (demux_res_t* demux_res, stream_t* stream, unsigned int m4a_seek (demux_res_t* demux_res, stream_t* stream,
uint64_t sound_sample_loc, uint64_t* sound_samples_done, uint64_t sound_sample_loc, uint64_t* sound_samples_done,
int* current_sample); int* current_sample, int* lookup_table_idx);
unsigned int m4a_seek_raw (demux_res_t* demux_res, stream_t* stream, unsigned int m4a_seek_raw (demux_res_t* demux_res, stream_t* stream,
uint32_t file_loc, uint64_t* sound_samples_done, int* current_sample); uint32_t file_loc, uint64_t* sound_samples_done, int* current_sample, int* lookup_table_idx);
int m4a_check_sample_offset(demux_res_t *demux_res, uint32_t frame, uint32_t *start); int m4a_check_sample_offset(demux_res_t *demux_res, uint32_t frame, uint32_t *start);
#endif /* STREAM_H */ #endif /* STREAM_H */