skip junk in mp3_helix, refactor find_sync_word

git-svn-id: file:///home/notaz/opt/svn/PicoDrive@889 be3aeb3a-fb24-0410-a615-afba39da0efa

pico/pico.h

@@ -12,7 +12,7 @@
 #ifndef PICO_H
 #define PICO_H
 
-#include <stdio.h>
+//#include <stdio.h>
 
 // port-specific compile-time settings
 #include <port_config.h>
@@ -22,8 +22,8 @@ extern "C" {
 #endif
 
 // external funcs for Sega/Mega CD
-extern int  mp3_get_bitrate(FILE *f, int size);
+extern int  mp3_get_bitrate(void *f, int size);
-extern void mp3_start_play(FILE *f, int pos);
+extern void mp3_start_play(void *f, int pos);
 extern void mp3_update(int *buffer, int length, int stereo);
 
 // this function should write-back d-cache and invalidate i-cache

platform/common/mp3.c

@@ -0,0 +1,29 @@
+#include "mp3.h"
+
+int mp3_find_sync_word(const unsigned char *buf, int size)
+{
+	const 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 + size - 3; 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;
+}
+

platform/common/mp3.h

@@ -1,6 +1,8 @@
 
+int mp3_find_sync_word(const unsigned char *buf, int size);
+
 #ifdef __GP2X__
 void mp3_update_local(int *buffer, int length, int stereo);
-void mp3_start_play_local(FILE *f, int pos);
+void mp3_start_play_local(void *f, int pos);
 #endif
 

platform/common/mp3_helix.c

@@ -23,39 +23,13 @@ static unsigned char mp3_input_buffer[2*1024];
 #define mp3_start_play mp3_start_play_local
 #endif
 
-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 = find_sync_word(buff + offs, 2048 - offs);
+		offs1 = mp3_find_sync_word(buff + offs, 2048 - offs);
 		if (offs1 < 0) return -2;
 		offs += offs1;
 		if (2048 - offs < 4) return -3;
@@ -70,21 +44,24 @@ static int try_get_header(unsigned char *buff, MP3FrameInfo *fi)
 	return ret;
 }
 
-int mp3_get_bitrate(FILE *f, int len)
+int mp3_get_bitrate(void *f_, int len)
 {
 	unsigned char buff[2048];
 	MP3FrameInfo fi;
+	FILE *f = f_;
 	int ret;
 
-	memset(buff, 0, 2048);
+	memset(buff, 0, sizeof(buff));
 
-	if (mp3dec) MP3FreeDecoder(mp3dec);
+	if (mp3dec)
+		MP3FreeDecoder(mp3dec);
 	mp3dec = MP3InitDecoder();
 
 	fseek(f, 0, SEEK_SET);
-	ret = fread(buff, 1, 2048, f);
+	ret = fread(buff, 1, sizeof(buff), f);
 	fseek(f, 0, SEEK_SET);
-	if (ret <= 0) return -1;
+	if (ret <= 0)
+		return -1;
 
 	ret = try_get_header(buff, &fi);
 	if (ret != 0 || fi.bitrate == 0) {
@@ -94,7 +71,8 @@ int mp3_get_bitrate(FILE *f, int len)
 		fseek(f, 0, SEEK_SET);
 		ret = try_get_header(buff, &fi);
 	}
-	if (ret != 0) return ret;
+	if (ret != 0)
+		return ret;
 
 	// printf("bitrate: %i\n", fi.bitrate / 1000);
 
@@ -117,7 +95,7 @@ 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 = find_sync_word(mp3_input_buffer, bytesLeft);
+		offset = mp3_find_sync_word(mp3_input_buffer, bytesLeft);
 		if (offset < 0) {
 			lprintf("find_sync_word (%i/%i) err %i\n", mp3_file_pos, mp3_file_len, offset);
 			mp3_file_pos = mp3_file_len;
@@ -159,8 +137,10 @@ static int mp3_decode(void)
 	return 0;
 }
 
-void mp3_start_play(FILE *f, int pos)
+void mp3_start_play(void *f_, int pos)
 {
+	FILE *f = f_;
+
 	mp3_file_len = mp3_file_pos = 0;
 	mp3_current_file = NULL;
 	mp3_buffer_offs = 0;
@@ -177,11 +157,27 @@ void mp3_start_play(FILE *f, int pos)
 	fseek(f, 0, SEEK_END);
 	mp3_file_len = ftell(f);
 
+	// search for first sync word, skipping stuff like ID3 tags
+	while (mp3_file_pos < 128*1024) {
+		int offs, bytes;
+
+		fseek(f, mp3_file_pos, SEEK_SET);
+		bytes = fread(mp3_input_buffer, 1, sizeof(mp3_input_buffer), f);
+		if (bytes < 4)
+			break;
+		offs = mp3_find_sync_word(mp3_input_buffer, bytes);
+		if (offs >= 0) {
+			mp3_file_pos += offs;
+			break;
+		}
+		mp3_file_pos += bytes - 2;
+	}
+
 	// seek..
 	if (pos) {
-		unsigned long long pos64 = mp3_file_len;
+		unsigned long long pos64 = mp3_file_len - mp3_file_pos;
 		pos64 *= pos;
-		mp3_file_pos = pos64 >> 10;
+		mp3_file_pos += pos64 >> 10;
 	}
 
 	mp3_decode();

platform/gp2x/940ctl.c

@@ -475,9 +475,10 @@ void mp3_update(int *buffer, int length, int stereo)
 }
 
 
-void mp3_start_play(FILE *f, int pos) // pos is 0-1023
+void mp3_start_play(void *f_, int pos) // pos is 0-1023
 {
 	int byte_offs = 0;
+	FILE *f = f_;
 
 	if (!(PicoOpt & POPT_EN_MCD_CDDA) || f == NULL)
 		return;

platform/gp2x/Makefile

@@ -57,7 +57,7 @@ OBJS += pico/sound/mix_arm.o
 # common
 OBJS += platform/common/emu.o platform/common/menu.o platform/common/fonts.o platform/common/config.o \
 	platform/common/arm_utils.o platform/common/arm_linux.o platform/common/readpng.o \
-	platform/common/mp3_helix.o platform/common/input.o platform/common/main.o \
+	platform/common/mp3_helix.o platform/common/input.o platform/common/main.o platform/common/mp3.o \
 	platform/linux/sndout_oss.o platform/linux/plat.o platform/linux/in_evdev.o
 
 # unzip

platform/gp2x/code940/940.c

@@ -2,6 +2,7 @@
 // (c) Copyright 2006-2007, Grazvydas "notaz" Ignotas
 
 #include "940shared.h"
+#include "../../common/mp3.h"
 
 static _940_data_t *shared_data = (_940_data_t *)   0x00100000;
 static _940_ctl_t  *shared_ctl  = (_940_ctl_t *)    0x00200000;
@@ -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 */
 
 
-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;
@@ -63,7 +38,7 @@ static void mp3_decode(void)
 
 	for (retries = 0; retries < 2; retries++)
 	{
-		offset = find_sync_word(readPtr, bytesLeft);
+		offset = mp3_find_sync_word(readPtr, bytesLeft);
 		if (offset < 0)
 			goto set_eof;
 

platform/gp2x/code940/Makefile

@@ -19,11 +19,12 @@ AS = $(CROSS)as
 LD = $(CROSS)ld
 OBJCOPY = $(CROSS)objcopy
 
+vpath %.c = ../../common
+
 BIN = pico940_v3.bin
 
 all: $(BIN)
 
-
 .c.o:
 	@echo ">>>" $<
 	$(GCC) $(CFLAGS) -c $< -o $@
@@ -35,7 +36,7 @@ all: $(BIN)
 # stuff for 940 core
 
 # init, emu_control, emu
-OBJS940 += 940init.o 940.o 940ym2612.o memcpy.o misc_arm.o
+OBJS940 += 940init.o 940.o 940ym2612.o memcpy.o misc_arm.o mp3.o
 # the asm code seems to be faster when run on 920, but not on 940 for some reason
 # OBJS940 += ../../Pico/sound/ym2612_asm.o
 

platform/linux/io.c

@@ -348,12 +348,12 @@ void plat_finish(void)
 }
 
 /* misc */
-int mp3_get_bitrate(FILE *f, int size)
+int mp3_get_bitrate(void *f, int size)
 {
 	return 128;
 }
 
-void mp3_start_play(FILE *f, int pos)
+void mp3_start_play(void *f, int pos)
 {
 }
 

platform/pandora/Makefile

@@ -48,7 +48,7 @@ OBJS += plat.o asm_utils.o
 # common
 OBJS += platform/common/emu.o platform/common/menu.o platform/common/fonts.o platform/common/config.o \
 	platform/common/arm_utils.o platform/common/mp3_helix.o platform/common/arm_linux.o \
-	platform/common/readpng.o platform/common/input.o platform/common/main.o \
+	platform/common/readpng.o platform/common/input.o platform/common/main.o platform/common/mp3.o \
 	platform/linux/fbdev.o platform/linux/in_evdev.o platform/linux/sndout_oss.o \
 	platform/linux/plat.o platform/linux/oshide.o
 

platform/pandora/plat.c

@@ -155,7 +155,7 @@ void plat_video_wait_vsync(void)
 
 void plat_status_msg_clear(void)
 {
-	vout_fbdev_clear_lines(layer_fb, g_screen_height - 8, 8);
+	vout_fbdev_clear_lines(layer_fb, g_osd_y, 8);
 }
 
 void plat_status_msg_busy_next(const char *msg)

platform/psp/mp3.c

@@ -300,11 +300,11 @@ static int decode_thread(SceSize args, void *argp)
 
 
 // might be called before initialization
-int mp3_get_bitrate(FILE *f, int size)
+int mp3_get_bitrate(void *f, int size)
 {
 	int ret, retval = -1, sample_rate, bitrate;
 	// filenames are stored instead handles in PSP, due to stupid max open file limit
-	char *fname = (char *)f;
+	char *fname = f;
 
 	/* make sure thread is not busy.. */
 	if (thread_busy_sem >= 0)
@@ -351,9 +351,9 @@ end:
 
 static int mp3_job_started = 0, mp3_samples_ready = 0, mp3_buffer_offs = 0, mp3_play_bufsel = 0;
 
-void mp3_start_play(FILE *f, int pos)
+void mp3_start_play(void *f, int pos)
 {
-	char *fname = (char *)f;
+	char *fname = f;
 
 	if (!initialized) return;
 

platform/win32/plat.c

@@ -219,12 +219,12 @@ void plat_debug_cat(char *str)
 }
 
 // required by pico
-int mp3_get_bitrate(FILE *f, int size)
+int mp3_get_bitrate(void *f, int size)
 {
 	return 128;
 }
 
-void mp3_start_play(FILE *f, int pos)
+void mp3_start_play(void *f, int pos)
 {
 }