drc: support ms ABI

[picodrive.git] / platform / gp2x / code940 / 940.c

diff --git a/platform/gp2x/code940/940.c b/platform/gp2x/code940/940.c
index 90087a3..760816e 100644 (file)
--- a/platform/gp2x/code940/940.c
+++ b/platform/gp2x/code940/940.c
@@ -2,6 +2,7 @@
 // (c) Copyright 2006-2007, Grazvydas "notaz" Ignotas\r
 \r
 #include "940shared.h"\r
+#include "../../common/mp3.h"\r
 \r
 static _940_data_t *shared_data = (_940_data_t *)   0x00100000;\r
 static _940_ctl_t  *shared_ctl  = (_940_ctl_t *)    0x00200000;\r
@@ -25,32 +26,6 @@ void _memcpy(void *dst, const void *src, int count);
 //     asm volatile ("mcr p15, 0, r0, c7, c10, 4" ::: "r0"); /* drain write buffer */\r
 \r
 \r
-static int find_sync_word(unsigned char *buf, int nBytes)\r
-{\r
-       unsigned char *p, *pe;\r
-\r
-       /* find byte-aligned syncword - need 12 (MPEG 1,2) or 11 (MPEG 2.5) matching bits */\r
-       for (p = buf, pe = buf + nBytes - 4; p < pe; p++)\r
-       {\r
-               int pn;\r
-               if (p[0] != 0xff) continue;\r
-               pn = p[1];\r
-               if ((pn & 0xf8) != 0xf8 || // currently must be MPEG1\r
-                   (pn & 6) == 0) {       // invalid layer\r
-                       p++; continue;\r
-               }\r
-               pn = p[2];\r
-               if ((pn & 0xf0) < 0x20 || (pn & 0xf0) == 0xf0 || // bitrates\r
-                   (pn & 0x0c) != 0) { // not 44kHz\r
-                       continue;\r
-               }\r
-\r
-               return p - buf;\r
-       }\r
-\r
-       return -1;\r
-}\r
-\r
 static void mp3_decode(void)\r
 {\r
        int mp3_offs = shared_ctl->mp3_offs;\r
@@ -61,32 +36,43 @@ static void mp3_decode(void)
 \r
        if (bytesLeft <= 0) return; // EOF, nothing to do\r
 \r
-retry:\r
-       offset = find_sync_word(readPtr, bytesLeft);\r
-       if (offset < 0) {\r
-               set_if_not_changed(&shared_ctl->mp3_offs, mp3_offs, shared_ctl->mp3_len);\r
-               return; // EOF\r
-       }\r
-       readPtr += offset;\r
-       bytesLeft -= offset;\r
-\r
-       err = MP3Decode(shared_data->mp3dec, &readPtr, &bytesLeft,\r
-                       shared_data->mp3_buffer[shared_ctl->mp3_buffsel], 0);\r
-       if (err) {\r
-               if (err == ERR_MP3_INDATA_UNDERFLOW) {\r
-                       set_if_not_changed(&shared_ctl->mp3_offs, mp3_offs, shared_ctl->mp3_len);\r
-                       return;\r
-               } else if (err <= -6 && err >= -12) {\r
-                       // ERR_MP3_INVALID_FRAMEHEADER, ERR_MP3_INVALID_*\r
-                       // just try to skip the offending frame..\r
-                       readPtr++;\r
-                       bytesLeft--;\r
-                       if (retries++ < 2) goto retry;\r
+       for (retries = 0; retries < 2; retries++)\r
+       {\r
+               offset = mp3_find_sync_word(readPtr, bytesLeft);\r
+               if (offset < 0)\r
+                       goto set_eof;\r
+\r
+               readPtr += offset;\r
+               bytesLeft -= offset;\r
+\r
+               err = MP3Decode(shared_data->mp3dec, &readPtr, &bytesLeft,\r
+                               shared_data->mp3_buffer[shared_ctl->mp3_buffsel], 0);\r
+               if (err) {\r
+                       if (err == ERR_MP3_MAINDATA_UNDERFLOW)\r
+                               // just need another frame\r
+                               continue;\r
+\r
+                       if (err == ERR_MP3_INDATA_UNDERFLOW)\r
+                               goto set_eof;\r
+\r
+                       if (err <= -6 && err >= -12) {\r
+                               // ERR_MP3_INVALID_FRAMEHEADER, ERR_MP3_INVALID_*\r
+                               // just try to skip the offending frame..\r
+                               readPtr++;\r
+                               bytesLeft--;\r
+                               continue;\r
+                       }\r
+                       shared_ctl->mp3_errors++;\r
+                       shared_ctl->mp3_lasterr = err;\r
                }\r
-               shared_ctl->mp3_errors++;\r
-               shared_ctl->mp3_lasterr = err;\r
+               break;\r
        }\r
+\r
        set_if_not_changed(&shared_ctl->mp3_offs, mp3_offs, readPtr - mp3_data);\r
+       return;\r
+\r
+set_eof:\r
+       set_if_not_changed(&shared_ctl->mp3_offs, mp3_offs, shared_ctl->mp3_len);\r
 }\r
 \r
 static void ym_flush_writes(void)\r