len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-12-07 13:45:03 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Improved seeking in a52 codec

Browse source 
(Patch by Igor Poretsky)

Change-Id: I0cdc2021b44f6cd6e76def190d9f04733b922454
This commit is contained in:
Solomon Peachy 2018-12-15 19:27:20 -05:00
parent d258edbb4f
commit b51995942e
1 changed files with 28 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

37
lib/rbcodec/codecs/a52.c
View file

@ -36,6 +36,14 @@ static unsigned long frequency;
/* used outside liba52 */ /* used outside liba52 */
static uint8_t buf[3840] IBSS_ATTR; static uint8_t buf[3840] IBSS_ATTR;
static uint8_t *bufptr = buf;
static uint8_t *bufpos = buf + 7;
static void a52_decoder_reset(void)
{
bufptr = buf;
bufpos = buf + 7;
}
static inline void output_audio(sample_t *samples) static inline void output_audio(sample_t *samples)
{ {
@ -43,10 +51,8 @@ static inline void output_audio(sample_t *samples)
ci->pcmbuf_insert(&samples[0], &samples[256], 256); ci->pcmbuf_insert(&samples[0], &samples[256], 256);
} }
static void a52_decode_data(uint8_t *start, uint8_t *end) static size_t a52_decode_data(uint8_t *start, uint8_t *end)
{ {
static uint8_t *bufptr = buf;
static uint8_t *bufpos = buf + 7;
/* /*
* sample_rate and flags are static because this routine could * sample_rate and flags are static because this routine could
* exit between the a52_syncinfo() and the ao_setup(), and we want * exit between the a52_syncinfo() and the ao_setup(), and we want
@ -56,6 +62,7 @@ static void a52_decode_data(uint8_t *start, uint8_t *end)
static int flags; static int flags;
int bit_rate; int bit_rate;
int len; int len;
size_t consumed = 0;
while (1) { while (1) {
len = end - start; len = end - start;
@ -66,6 +73,7 @@ static void a52_decode_data(uint8_t *start, uint8_t *end)
memcpy(bufptr, start, len); memcpy(bufptr, start, len);
bufptr += len; bufptr += len;
start += len; start += len;
consumed += len;
if (bufptr == bufpos) { if (bufptr == bufpos) {
if (bufpos == buf + 7) { if (bufpos == buf + 7) {
int length; int length;
@ -105,7 +113,7 @@ static void a52_decode_data(uint8_t *start, uint8_t *end)
ci->set_elapsed(samplesdone/(frequency/1000)); ci->set_elapsed(samplesdone/(frequency/1000));
bufptr = buf; bufptr = buf;
bufpos = buf + 7; bufpos = buf + 7;
continue; break;
error: error:
//logf("Error decoding A52 stream\n"); //logf("Error decoding A52 stream\n");
bufptr = buf; bufptr = buf;
@ -113,6 +121,7 @@ static void a52_decode_data(uint8_t *start, uint8_t *end)
} }
} }
} }
return consumed;
} }
/* this is the codec entry point */ /* this is the codec entry point */
@ -134,7 +143,7 @@ enum codec_status codec_main(enum codec_entry_call_reason reason)
/* this is called for each file to process */ /* this is called for each file to process */
enum codec_status codec_run(void) enum codec_status codec_run(void)
{ {
size_t n; size_t n, consumed = 0, rest = 0;
unsigned char *filebuf; unsigned char *filebuf;
int sample_loc; int sample_loc;
intptr_t param; intptr_t param;
@ -145,7 +154,7 @@ enum codec_status codec_run(void)
ci->configure(DSP_SET_FREQUENCY, ci->id3->frequency); ci->configure(DSP_SET_FREQUENCY, ci->id3->frequency);
codec_set_replaygain(ci->id3); codec_set_replaygain(ci->id3);
/* Intialise the A52 decoder and check for success */ /* Initialise the A52 decoder and check for success */
state = a52_init(0); state = a52_init(0);
samplesdone = 0; samplesdone = 0;
@ -187,15 +196,25 @@ enum codec_status codec_run(void)
ci->set_elapsed(samplesdone/(ci->id3->frequency/1000)); ci->set_elapsed(samplesdone/(ci->id3->frequency/1000));
} }
ci->seek_complete(); ci->seek_complete();
a52_decoder_reset();
} }
filebuf = ci->request_buffer(&n, BUFFER_SIZE); filebuf = ci->request_buffer(&n, BUFFER_SIZE);
if (n == 0) /* End of Stream */ if (n == 0) /* End of Stream */
{
filebuf += consumed;
for (n = ci->curpos + consumed; rest; rest -= consumed, n += consumed)
{
ci->set_offset(n);
consumed = a52_decode_data(filebuf, filebuf + rest);
}
break; break;
}
a52_decode_data(filebuf, filebuf + n);
ci->advance_buffer(n); consumed = a52_decode_data(filebuf, filebuf + n);
rest = n - consumed;
ci->advance_buffer(consumed);
} }
return CODEC_OK; return CODEC_OK;