From: notaz Date: Sun, 6 Jul 2008 20:28:11 +0000 (+0000) Subject: occasional mp3 click noises fixed X-Git-Tag: v1.85~432 X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=091facb8fe133c8318ed13147b244e9af602a2ac;p=picodrive.git occasional mp3 click noises fixed git-svn-id: file:///home/notaz/opt/svn/PicoDrive@530 be3aeb3a-fb24-0410-a615-afba39da0efa --- diff --git a/platform/common/mp3_helix.c b/platform/common/mp3_helix.c index 3e75ab97..f28abda9 100644 --- a/platform/common/mp3_helix.c +++ b/platform/common/mp3_helix.c @@ -15,13 +15,40 @@ static HMP3Decoder mp3dec = 0; static int mp3_buffer_offs = 0; +static int find_sync_word(unsigned char *buf, int nBytes) +{ + unsigned char *p, *pe; + + /* find byte-aligned syncword - need 12 (MPEG 1,2) or 11 (MPEG 2.5) matching bits */ + for (p = buf, pe = buf + nBytes - 4; p < pe; p++) + { + int pn; + if (p[0] != 0xff) continue; + pn = p[1]; + if ((pn & 0xf8) != 0xf8 || // currently must be MPEG1 + (pn & 6) == 0) { // invalid layer + p++; continue; + } + pn = p[2]; + if ((pn & 0xf0) < 0x20 || (pn & 0xf0) == 0xf0 || // bitrates + (pn & 0x0c) != 0) { // not 44kHz + continue; + } + + return p - buf; + } + + return -1; +} + + static int try_get_header(unsigned char *buff, MP3FrameInfo *fi) { int ret, offs1, offs = 0; while (1) { - offs1 = MP3FindSyncWord(buff + offs, 2048 - offs); + offs1 = find_sync_word(buff + offs, 2048 - offs); if (offs1 < 0) return -2; offs += offs1; if (2048 - offs < 4) return -3; @@ -44,7 +71,8 @@ int mp3_get_bitrate(FILE *f, int len) memset(buff, 0, 2048); - if (!mp3dec) mp3dec = MP3InitDecoder(); + if (mp3dec) MP3FreeDecoder(mp3dec); + mp3dec = MP3InitDecoder(); fseek(f, 0, SEEK_SET); ret = fread(buff, 1, 2048, f); @@ -81,11 +109,12 @@ static int mp3_decode(void) unsigned char *readPtr = mp3_mem + mp3_offs; int bytesLeft = shared_ctl->mp3_len - mp3_offs; int offset; // frame offset from readPtr - int err; + int retries = 0, err; if (bytesLeft <= 0) return 1; // EOF, nothing to do - offset = MP3FindSyncWord(readPtr, bytesLeft); +retry: + offset = find_sync_word(readPtr, bytesLeft); if (offset < 0) { shared_ctl->mp3_offs = shared_ctl->mp3_len; return 1; // EOF @@ -102,6 +131,9 @@ static int mp3_decode(void) // ERR_MP3_INVALID_FRAMEHEADER, ERR_MP3_INVALID_* // just try to skip the offending frame.. readPtr++; + bytesLeft--; + if (retries++ < 2) goto retry; + else lprintf("mp3 decode failed with %i after %i retries\n", err, retries); } shared_ctl->mp3_errors++; shared_ctl->mp3_lasterr = err; @@ -112,6 +144,10 @@ static int mp3_decode(void) void mp3_start_local(void) { + // must re-init decoder for new track + if (mp3dec) MP3FreeDecoder(mp3dec); + mp3dec = MP3InitDecoder(); + mp3_buffer_offs = 0; mp3_decode(); } @@ -138,9 +174,9 @@ static int mp3_decode(void) fseek(mp3_current_file, mp3_file_pos, SEEK_SET); bytesLeft = fread(mp3_input_buffer, 1, sizeof(mp3_input_buffer), mp3_current_file); - offset = MP3FindSyncWord(mp3_input_buffer, bytesLeft); + offset = find_sync_word(mp3_input_buffer, bytesLeft); if (offset < 0) { - //lprintf("MP3FindSyncWord (%i/%i) err %i\n", mp3_file_pos, mp3_file_len, offset); + //lprintf("find_sync_word (%i/%i) err %i\n", mp3_file_pos, mp3_file_len, offset); mp3_file_pos = mp3_file_len; return 1; // EOF } @@ -179,6 +215,10 @@ void mp3_start_play(FILE *f, int pos) mp3_current_file = NULL; mp3_buffer_offs = 0; + // must re-init decoder for new track + if (mp3dec) MP3FreeDecoder(mp3dec); + mp3dec = MP3InitDecoder(); + if (!(PicoOpt&POPT_EN_MCD_CDDA) || f == NULL) // cdda disabled or no file? return; diff --git a/platform/gp2x/940ctl.c b/platform/gp2x/940ctl.c index ee250f8a..f01ffa33 100644 --- a/platform/gp2x/940ctl.c +++ b/platform/gp2x/940ctl.c @@ -508,7 +508,7 @@ void mp3_start_play(FILE *f, int pos) // pos is 0-1023 shared_ctl->mp3_len = ftell(f); loaded_mp3 = f; - if (PicoOpt&0x200) { + if (PicoOpt & POPT_EXT_FM) { // as we are going to change 940's cacheable area, we must invalidate it's cache.. if (CHECK_BUSY(JOB940_MP3DECODE)) wait_busy_940(JOB940_MP3DECODE); add_job_940(JOB940_INVALIDATE_DCACHE); @@ -522,7 +522,7 @@ void mp3_start_play(FILE *f, int pos) // pos is 0-1023 byte_offs *= pos; byte_offs >>= 6; } - // printf("mp3 pos1024: %i, byte_offs %i/%i\n", pos, byte_offs, shared_ctl->mp3_len); + printf(" mp3 pos1024: %i, byte_offs %i/%i\n", pos, byte_offs, shared_ctl->mp3_len); shared_ctl->mp3_offs = byte_offs; @@ -531,7 +531,13 @@ void mp3_start_play(FILE *f, int pos) // pos is 0-1023 mp3_job_started = 0; shared_ctl->mp3_buffsel = 1; // will change to 0 on first decode - if (!(PicoOpt&0x200)) mp3_start_local(); + if (PicoOpt & POPT_EXT_FM) + { + add_job_940(JOB940_MP3RESET); + if (CHECK_BUSY(JOB940_MP3RESET)) wait_busy_940(JOB940_MP3RESET); + } + else + mp3_start_local(); } diff --git a/platform/gp2x/code940/940.c b/platform/gp2x/code940/940.c index 0df19453..90087a3e 100644 --- a/platform/gp2x/code940/940.c +++ b/platform/gp2x/code940/940.c @@ -25,17 +25,44 @@ void _memcpy(void *dst, const void *src, int count); // asm volatile ("mcr p15, 0, r0, c7, c10, 4" ::: "r0"); /* drain write buffer */ +static int find_sync_word(unsigned char *buf, int nBytes) +{ + unsigned char *p, *pe; + + /* find byte-aligned syncword - need 12 (MPEG 1,2) or 11 (MPEG 2.5) matching bits */ + for (p = buf, pe = buf + nBytes - 4; p < pe; p++) + { + int pn; + if (p[0] != 0xff) continue; + pn = p[1]; + if ((pn & 0xf8) != 0xf8 || // currently must be MPEG1 + (pn & 6) == 0) { // invalid layer + p++; continue; + } + pn = p[2]; + if ((pn & 0xf0) < 0x20 || (pn & 0xf0) == 0xf0 || // bitrates + (pn & 0x0c) != 0) { // not 44kHz + continue; + } + + return p - buf; + } + + return -1; +} + static void mp3_decode(void) { int mp3_offs = shared_ctl->mp3_offs; unsigned char *readPtr = mp3_data + mp3_offs; int bytesLeft = shared_ctl->mp3_len - mp3_offs; int offset; // frame offset from readPtr - int err; + int retries = 0, err; if (bytesLeft <= 0) return; // EOF, nothing to do - offset = MP3FindSyncWord(readPtr, bytesLeft); +retry: + offset = find_sync_word(readPtr, bytesLeft); if (offset < 0) { set_if_not_changed(&shared_ctl->mp3_offs, mp3_offs, shared_ctl->mp3_len); return; // EOF @@ -53,6 +80,8 @@ static void mp3_decode(void) // ERR_MP3_INVALID_FRAMEHEADER, ERR_MP3_INVALID_* // just try to skip the offending frame.. readPtr++; + bytesLeft--; + if (retries++ < 2) goto retry; } shared_ctl->mp3_errors++; shared_ctl->mp3_lasterr = err; @@ -189,6 +218,11 @@ void Main940(void) case JOB940_MP3DECODE: mp3_decode(); break; + + case JOB940_MP3RESET: + if (shared_data->mp3dec) MP3FreeDecoder(shared_data->mp3dec); + shared_data->mp3dec = MP3InitDecoder(); + break; } shared_ctl->loopc++; diff --git a/platform/gp2x/code940/940shared.h b/platform/gp2x/code940/940shared.h index 7e578abe..7f348e2d 100644 --- a/platform/gp2x/code940/940shared.h +++ b/platform/gp2x/code940/940shared.h @@ -12,6 +12,7 @@ enum _940_job_t { JOB940_PICOSTATESAVE2, JOB940_PICOSTATELOAD2_PREP, JOB940_PICOSTATELOAD2, + JOB940_MP3RESET, }; //#define MAX_940JOBS 2