static char *chunk_names[] = {
+ "INVALID!",
"Saving.. M68K state",
"Saving.. RAM",
"Saving.. VRAM",
}\r
\r
// CD: CDDA audio\r
- if ((PicoMCD & 1) && (PicoOpt & 0x800))\r
+ // CD mode, cdda enabled, not data track, CDC is reading\r
+ if ((PicoMCD & 1) && (PicoOpt & 0x800) && !(Pico_mcd->s68k_regs[0x36] & 1) && (Pico_mcd->scd.Status_CDC & 1))\r
mp3_update(buf32, length, stereo);\r
\r
// convert + limit to normal 16bit output\r
\r
lprintf("saveLoad (%i, %i): %s\n", load, sram, saveFname);\r
\r
- if(sram) {\r
+ if (sram)\r
+ {\r
FILE *sramFile;\r
int sram_size;\r
unsigned char *sram_data;\r
else\r
{\r
void *PmovFile = NULL;\r
- if (strcmp(saveFname + strlen(saveFname) - 3, ".gz") == 0) {\r
+ if (strcmp(saveFname + strlen(saveFname) - 3, ".gz") == 0)\r
+ {\r
if( (PmovFile = gzopen(saveFname, load ? "rb" : "wb")) ) {\r
emu_setSaveStateCbs(1);\r
- if(!load) gzsetparams(PmovFile, 9, Z_DEFAULT_STRATEGY);\r
+ if (!load) gzsetparams(PmovFile, 9, Z_DEFAULT_STRATEGY);\r
}\r
}\r
else\r
+#ifdef __GP2X__
void mp3_update_local(int *buffer, int length, int stereo);
void mp3_start_local(void);
+#endif
--- /dev/null
+// Some mp3 related code for Sega/Mega CD.
+// Uses the Helix Fixed-point MP3 decoder
+
+// (c) Copyright 2007, Grazvydas "notaz" Ignotas
+
+#include <stdio.h>
+#include <string.h>
+
+#include "../../Pico/PicoInt.h"
+#include "../../Pico/sound/mix.h"
+#include "helix/pub/mp3dec.h"
+#include "lprintf.h"
+
+static short mp3_out_buffer[2*1152];
+static HMP3Decoder mp3dec = 0;
+static int mp3_buffer_offs = 0;
+
+
+static int try_get_header(unsigned char *buff, MP3FrameInfo *fi)
+{
+ int ret, offs1, offs = 0;
+
+ while (1)
+ {
+ offs1 = MP3FindSyncWord(buff + offs, 2048 - offs);
+ if (offs1 < 0) return -2;
+ offs += offs1;
+ if (2048 - offs < 4) return -3;
+
+ // printf("trying header %08x\n", *(int *)(buff + offs));
+
+ ret = MP3GetNextFrameInfo(mp3dec, fi, buff + offs);
+ if (ret == 0 && fi->bitrate != 0) break;
+ offs++;
+ }
+
+ return ret;
+}
+
+int mp3_get_bitrate(FILE *f, int len)
+{
+ unsigned char buff[2048];
+ MP3FrameInfo fi;
+ int ret;
+
+ memset(buff, 0, 2048);
+
+ if (!mp3dec) mp3dec = MP3InitDecoder();
+
+ fseek(f, 0, SEEK_SET);
+ ret = fread(buff, 1, 2048, f);
+ fseek(f, 0, SEEK_SET);
+ if (ret <= 0) return -1;
+
+ ret = try_get_header(buff, &fi);
+ if (ret != 0 || fi.bitrate == 0) {
+ // try to read somewhere around the middle
+ fseek(f, len>>1, SEEK_SET);
+ fread(buff, 1, 2048, f);
+ fseek(f, 0, SEEK_SET);
+ ret = try_get_header(buff, &fi);
+ }
+ if (ret != 0) return ret;
+
+ // printf("bitrate: %i\n", fi.bitrate / 1000);
+
+ return fi.bitrate / 1000;
+}
+
+
+#ifdef __GP2X__
+
+#include "../gp2x/code940/940shared.h"
+
+extern _940_ctl_t *shared_ctl;
+extern unsigned char *mp3_mem;
+
+static int mp3_decode(void)
+{
+ // tried copying this to cached mem, no improvement noticed
+ int mp3_offs = shared_ctl->mp3_offs;
+ unsigned char *readPtr = mp3_mem + mp3_offs;
+ int bytesLeft = shared_ctl->mp3_len - mp3_offs;
+ int offset; // frame offset from readPtr
+ int err;
+
+ if (bytesLeft <= 0) return 1; // EOF, nothing to do
+
+ offset = MP3FindSyncWord(readPtr, bytesLeft);
+ if (offset < 0) {
+ shared_ctl->mp3_offs = shared_ctl->mp3_len;
+ return 1; // EOF
+ }
+ readPtr += offset;
+ bytesLeft -= offset;
+
+ err = MP3Decode(mp3dec, &readPtr, &bytesLeft, mp3_out_buffer, 0);
+ if (err) {
+ if (err == ERR_MP3_INDATA_UNDERFLOW) {
+ shared_ctl->mp3_offs = shared_ctl->mp3_len; // EOF
+ return 1;
+ } else if (err <= -6 && err >= -12) {
+ // ERR_MP3_INVALID_FRAMEHEADER, ERR_MP3_INVALID_*
+ // just try to skip the offending frame..
+ readPtr++;
+ }
+ shared_ctl->mp3_errors++;
+ shared_ctl->mp3_lasterr = err;
+ }
+ shared_ctl->mp3_offs = readPtr - mp3_mem;
+ return 0;
+}
+
+void mp3_start_local(void)
+{
+ mp3_buffer_offs = 0;
+ mp3_decode();
+}
+
+#define mp3_update mp3_update_local
+
+#else
+
+static FILE *mp3_current_file = NULL;
+static int mp3_file_len = 0, mp3_file_pos = 0;
+static unsigned char mp3_input_buffer[2*1024];
+
+static int mp3_decode(void)
+{
+ unsigned char *readPtr;
+ int bytesLeft;
+ int offset; // mp3 frame offset from readPtr
+ int err;
+
+ do
+ {
+ if (mp3_file_pos >= mp3_file_len) return 1; // EOF, nothing to do
+
+ 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);
+ if (offset < 0) {
+ //lprintf("MP3FindSyncWord (%i/%i) err %i\n", mp3_file_pos, mp3_file_len, offset);
+ mp3_file_pos = mp3_file_len;
+ return 1; // EOF
+ }
+ readPtr = mp3_input_buffer + offset;
+ bytesLeft -= offset;
+
+ err = MP3Decode(mp3dec, &readPtr, &bytesLeft, mp3_out_buffer, 0);
+ if (err) {
+ //lprintf("MP3Decode err (%i/%i) %i\n", mp3_file_pos, mp3_file_len, err);
+ if (err == ERR_MP3_INDATA_UNDERFLOW) {
+ if (offset == 0)
+ // something's really wrong here, frame had to fit
+ mp3_file_pos = mp3_file_len;
+ else
+ mp3_file_pos += offset;
+ continue;
+ } else if (err <= -6 && err >= -12) {
+ // ERR_MP3_INVALID_FRAMEHEADER, ERR_MP3_INVALID_*
+ // just try to skip the offending frame..
+ mp3_file_pos += offset + 1;
+ continue;
+ }
+ mp3_file_pos = mp3_file_len;
+ return 1;
+ }
+ mp3_file_pos += readPtr - mp3_input_buffer;
+ }
+ while (0);
+
+ return 0;
+}
+
+void mp3_start_play(FILE *f, int pos)
+{
+ mp3_file_len = mp3_file_pos = 0;
+ mp3_current_file = NULL;
+ mp3_buffer_offs = 0;
+
+ if (!(PicoOpt&0x800) || f == NULL) // cdda disabled or no file?
+ return;
+
+ //lprintf("mp3_start_play %p %i\n", f, pos);
+
+ mp3_current_file = f;
+ fseek(f, 0, SEEK_END);
+ mp3_file_len = ftell(f);
+
+ // seek..
+ if (pos) {
+ mp3_file_pos = (mp3_file_len << 6) >> 10;
+ mp3_file_pos *= pos;
+ mp3_file_pos >>= 6;
+ }
+
+ mp3_decode();
+}
+
+int mp3_get_offset(void)
+{
+ unsigned int offs1024 = 0;
+ int cdda_on;
+
+ cdda_on = (PicoMCD & 1) && (PicoOpt&0x800) && !(Pico_mcd->s68k_regs[0x36] & 1) &&
+ (Pico_mcd->scd.Status_CDC & 1) && mp3_current_file != NULL;
+
+ if (cdda_on) {
+ offs1024 = mp3_file_pos << 7;
+ offs1024 /= mp3_file_len >> 3;
+ }
+ //lprintf("mp3_get_offset offs1024=%u (%i/%i)\n", offs1024, mp3_file_pos, mp3_file_len);
+
+ return offs1024;
+}
+
+#endif // ifndef __GP2X__
+
+void mp3_update(int *buffer, int length, int stereo)
+{
+ int length_mp3, shr = 0;
+ void (*mix_samples)(int *dest_buf, short *mp3_buf, int count) = mix_16h_to_32;
+
+#ifndef __GP2X__
+ if (mp3_current_file == NULL || mp3_file_pos >= mp3_file_len) return; // no file / EOF
+#endif
+
+ length_mp3 = length;
+ if (PsndRate == 22050) { mix_samples = mix_16h_to_32_s1; length_mp3 <<= 1; shr = 1; }
+ else if (PsndRate == 11025) { mix_samples = mix_16h_to_32_s2; length_mp3 <<= 2; shr = 2; }
+
+ if (1152 - mp3_buffer_offs >= length_mp3) {
+ mix_samples(buffer, mp3_out_buffer + mp3_buffer_offs*2, length<<1);
+
+ mp3_buffer_offs += length_mp3;
+ } else {
+ int ret, left = 1152 - mp3_buffer_offs;
+
+ mix_samples(buffer, mp3_out_buffer + mp3_buffer_offs*2, (left>>shr)<<1);
+ ret = mp3_decode();
+ if (ret == 0) {
+ mp3_buffer_offs = length_mp3 - left;
+ mix_samples(buffer + ((left>>shr)<<1), mp3_out_buffer, (mp3_buffer_offs>>shr)<<1);
+ } else
+ mp3_buffer_offs = 0;
+ }
+}
+
+
\r
# you may or may not need to change this\r
-CROSS = /opt/cegcc/arm-wince-cegcc/bin/\r
+export CROSS = /opt/cegcc/arm-wince-cegcc/bin/\r
\r
# settings\r
asm_memory = 1\r
OBJS += main.o emu.o menu.o giz.o asm_utils.o\r
\r
# common\r
-OBJS += ../common/emu.o ../common/menu.o ../common/fonts.o ../common/arm_utils.o ../common/readpng.o\r
+OBJS += ../common/emu.o ../common/menu.o ../common/fonts.o ../common/arm_utils.o \\r
+ ../common/readpng.o ../common/mp3_helix.o\r
\r
# Pico\r
ifeq "$(amalgamate)" "1"\r
../../zlib/deflate.o ../../zlib/crc32.o ../../zlib/adler32.o ../../zlib/zutil.o ../../zlib/compress.o\r
# unzip\r
OBJS += ../../unzip/unzip.o ../../unzip/unzip_stream.o\r
-# mp3\r
-OBJS += mp3.o\r
# CPU cores\r
# Cyclone\r
DEFINC += -DEMU_C68K\r
\r
all: PicoDrive.exe\r
\r
-PicoDrive.exe : $(OBJS)\r
+PicoDrive.exe : $(OBJS) ../common/helix/helix_mp3.a\r
@echo ">>>" $@\r
$(GCC) -o $@ -static $(COPT) $^ -lm -lpng -Lkgsdk/ -lKGSDK -Wl,-Map=PicoDrive.map 2>&1 | \\r
grep -v ".idata$$4" # | grep -v "supports interworking, whereas"\r
@echo building Cyclone...\r
@make -C ../../cpu/Cyclone/proj CONFIG_FILE=config_pico.h\r
\r
+# build helix libs\r
+../common/helix/helix_mp3.a:\r
+ make -C ../common/helix\r
\r
\r
# cleanup\r
Framework2D_UnlockBuffer();
giz_screen = NULL;
+
+ Sleep(0); /* yield the CPU, the system may need it */
}
static void emu_msg_tray_open(void)
giz_screen = NULL;
}
-
+/*
#include <stdarg.h>
static void stdbg(const char *fmt, ...)
{
noticeMsgTime = GetTickCount();
}
-
+*/
static void updateSound(int len)
{
PsndOut += len;
if (PsndOut - snd_cbuff >= snd_cbuf_samples)
{
- if (PsndOut - snd_cbuff != snd_cbuf_samples)
- stdbg("snd diff is %i, not %i", PsndOut - snd_cbuff, snd_cbuf_samples);
+ //if (PsndOut - snd_cbuff != snd_cbuf_samples)
+ // stdbg("snd diff is %i, not %i", PsndOut - snd_cbuff, snd_cbuf_samples);
PsndOut = snd_cbuff;
}
}
static void RunEvents(unsigned int which)
{
- if (which & 0x1800) { // save or load (but not both)
+ if (which & 0x1800) // save or load (but not both)
+ {
int do_it = 1;
+
+ if (PsndOut != NULL)
+ FrameworkAudio_SetPause(1);
+ if (giz_screen == NULL)
+ giz_screen = Framework2D_LockBuffer();
if ( emu_checkSaveFile(state_slot) &&
(( (which & 0x1000) && (currentConfig.EmuOpt & 0x800)) || // load
(!(which & 0x1000) && (currentConfig.EmuOpt & 0x200))) ) // save
{
int keys;
- if (giz_screen == NULL)
- giz_screen = Framework2D_LockBuffer();
blit("", (which & 0x1000) ? "LOAD STATE? (PLAY=yes, STOP=no)" : "OVERWRITE SAVE? (PLAY=yes, STOP=no)");
while( !((keys = Framework_PollGetButtons()) & (BTN_PLAY|BTN_STOP)) )
Sleep(50);
if (keys & BTN_STOP) do_it = 0;
+ while( ((keys = Framework_PollGetButtons()) & (BTN_PLAY|BTN_STOP)) ) // wait for release
+ Sleep(50);
clearArea(0);
}
- if (do_it) {
+
+ if (do_it)
+ {
osd_text(4, 232, (which & 0x1000) ? "LOADING GAME" : "SAVING GAME");
PicoStateProgressCB = emu_state_cb;
emu_SaveLoadGame((which & 0x1000) >> 12, 0);
PicoStateProgressCB = NULL;
+ Sleep(0);
}
+ if (PsndOut != NULL)
+ FrameworkAudio_SetPause(0);
reset_timing = 1;
}
- if (which & 0x0400) { // switch renderer
+ if (which & 0x0400) // switch renderer
+ {
if (PicoOpt&0x10) { PicoOpt&=~0x10; currentConfig.EmuOpt |= 0x80; }
else { PicoOpt|= 0x10; currentConfig.EmuOpt &= ~0x80; }
noticeMsgTime = GetTickCount();
}
- if (which & 0x0300) {
+ if (which & 0x0300)
+ {
if(which&0x0200) {
state_slot -= 1;
if(state_slot < 0) state_slot = 9;
PsndOut = NULL;
if (currentConfig.EmuOpt & 4)
{
- int ret, snd_excess_add, stereo=(PicoOpt&8)>>3;
+ int ret, snd_excess_add, stereo;
if (PsndRate != PsndRate_old || (PicoOpt&0x0b) != (PicoOpt_old&0x0b) || Pico.m.pal != pal_old) {
sound_rerate(Pico.m.frame_count ? 1 : 0);
}
+ stereo=(PicoOpt&8)>>3;
snd_excess_add = ((PsndRate - PsndLen*target_fps)<<16) / target_fps;
snd_cbuf_samples = (PsndRate<<stereo) * 16 / target_fps;
lprintf("starting audio: %i len: %i (ex: %04x) stereo: %i, pal: %i\n",
tval = GetTickCount();
if (reset_timing || tval < tval_prev) {
- stdbg("timing reset");
+ //stdbg("timing reset");
reset_timing = 0;
tval_thissec = tval;
frames_shown = frames_done = 0;
audio_skew_prev = audio_skew;
target_frametime += adj;
sec_ms = (target_frametime * target_fps) >> 8;
- stdbg("%i %i %i", audio_skew, adj, sec_ms);
+ //stdbg("%i %i %i", audio_skew, adj, sec_ms);
frames_done = frames_shown = 0;
}
else if (currentConfig.Frameskip < 0) {
}\r
break;\r
case MA_OPT_SOUND_QUALITY:\r
- if ((inp & BTN_RIGHT) && currentConfig.PsndRate == 44100 && !(currentConfig.PicoOpt&0x08)) {\r
- currentConfig.PsndRate = 11025; currentConfig.PicoOpt|= 0x08;\r
- } else if ((inp & BTN_LEFT) && currentConfig.PsndRate == 11025 && (currentConfig.PicoOpt&0x08)) {\r
- currentConfig.PsndRate = 44100; currentConfig.PicoOpt&=~0x08;\r
- } else currentConfig.PsndRate = sndrate_prevnext(currentConfig.PsndRate, inp & BTN_RIGHT);\r
+ if ((inp & BTN_RIGHT) && currentConfig.PsndRate == 44100 &&\r
+ !(currentConfig.PicoOpt&0x08))\r
+ {\r
+ currentConfig.PsndRate = 11025;\r
+ currentConfig.PicoOpt |= 8;\r
+ } else if ((inp & BTN_LEFT) && currentConfig.PsndRate == 11025 &&\r
+ (currentConfig.PicoOpt&0x08) && !(PicoMCD&1))\r
+ {\r
+ currentConfig.PsndRate = 44100;\r
+ currentConfig.PicoOpt &= ~8;\r
+ } else\r
+ currentConfig.PsndRate = sndrate_prevnext(currentConfig.PsndRate, inp & BTN_RIGHT);\r
break;\r
case MA_OPT_REGION:\r
region_prevnext(inp & BTN_RIGHT);\r
menu_draw_begin(1);\r
\r
text_out16(tl_x, 20, "PicoDrive v" VERSION " (c) notaz, 2006,2007");\r
-text_out16(tl_x, 30, "beta1");\r
+text_out16(tl_x, 30, "rc1");\r
y = tl_y;\r
text_out16(tl_x, y, "Credits:");\r
text_out16(tl_x, (y+=10), "Dave: Cyclone 68000 core,");\r
+++ /dev/null
-#include <stdio.h>
-
-int mp3_get_bitrate(FILE *f, int size){ return 1; }
-void mp3_start_play(FILE *f, int pos){}
-int mp3_get_offset(void){ return 0; } // 0-1023
-void mp3_update(int *buffer, int length, int stereo){}
-
-
#include "gp2x.h"\r
#include "emu.h"\r
#include "menu.h"\r
-#include "mp3.h"\r
+#include "../common/mp3.h"\r
#include "../common/arm_utils.h"\r
#include "../common/menu.h"\r
#include "../common/emu.h"\r
int length_mp3;\r
int cdda_on;\r
\r
- // not data track, CDC is reading, playback was started, track not ended\r
- cdda_on = !(Pico_mcd->s68k_regs[0x36] & 1) && (Pico_mcd->scd.Status_CDC & 1) &&\r
- loaded_mp3 && shared_ctl->mp3_offs < shared_ctl->mp3_len;\r
+ // playback was started, track not ended\r
+ cdda_on = loaded_mp3 && shared_ctl->mp3_offs < shared_ctl->mp3_len;\r
\r
if (!cdda_on) return;\r
\r
\r
int mp3_get_offset(void)\r
{\r
- int offs1024 = 0;\r
+ unsigned int offs1024 = 0;\r
int cdda_on;\r
\r
cdda_on = (PicoMCD & 1) && (PicoOpt&0x800) && !(Pico_mcd->s68k_regs[0x36] & 1) &&\r
\r
if (cdda_on) {\r
offs1024 = shared_ctl->mp3_offs << 7;\r
- offs1024 /= shared_ctl->mp3_len;\r
- offs1024 <<= 3;\r
+ offs1024 /= shared_ctl->mp3_len >> 3;\r
}\r
- printf("offs1024=%i (%i/%i)\n", offs1024, shared_ctl->mp3_offs, shared_ctl->mp3_len);\r
+ printf("offs1024=%u (%i/%i)\n", offs1024, shared_ctl->mp3_offs, shared_ctl->mp3_len);\r
\r
return offs1024;\r
}\r
\r
# you may or may not need to change this\r
#devkit_path = x:/stuff/dev/devkitgp2x/\r
-CROSS = arm-linux-\r
+export CROSS = arm-linux-\r
#CROSS = $(devkit_path)bin/arm-linux-\r
\r
# settings\r
OBJS += 940ctl.o\r
\r
# common\r
-OBJS += ../common/emu.o ../common/menu.o ../common/fonts.o ../common/arm_utils.o ../common/readpng.o\r
+OBJS += ../common/emu.o ../common/menu.o ../common/fonts.o ../common/arm_utils.o \\r
+ ../common/readpng.o ../common/mp3_helix.o\r
\r
# Pico\r
ifeq "$(amalgamate)" "1"\r
../../zlib/deflate.o ../../zlib/crc32.o ../../zlib/adler32.o ../../zlib/zutil.o ../../zlib/compress.o\r
# unzip\r
OBJS += ../../unzip/unzip.o ../../unzip/unzip_stream.o\r
-# mp3\r
-OBJS += mp3.o\r
# debug\r
ifeq "$(debug_cyclone)" "1"\r
OBJS += ../../Pico/_cyclone_debug.o ../../cpu/musashi/m68kdasm.o\r
\r
all: PicoDrive.gpe\r
\r
-PicoDrive.gpe : $(OBJS) helix/helix_mp3.a\r
+PicoDrive.gpe : $(OBJS) ../common/helix/helix_mp3.a\r
@echo $@\r
@$(GCC) -o $@ $(COPT) $^ -lm -lpng -Wl,-Map=PicoDrive.map\r
ifeq ($(DEBUG),)\r
\r
\r
# build helix libs\r
-helix/helix_mp3.a:\r
- make -C helix\r
+../common/helix/helix_mp3.a:\r
+ make -C ../common/helix\r
\r
\r
# cleanup\r
#include "../../../Pico/sound/ym2612.h"\r
-#include "../helix/pub/mp3dec.h"\r
+#include "../../common/helix/pub/mp3dec.h"\r
\r
// max 16 jobs\r
enum _940_job_t {\r
#devkit_path = x:/stuff/dev/devkitgp2x/\r
devkit_path = /usr/local/devkitPro/devkitGP2X/\r
lgcc_path = $(devkit_path)lib/gcc/arm-linux/4.0.3/\r
-CROSS = arm-linux-\r
+export CROSS = arm-linux-\r
#CROSS = $(devkit_path)bin/arm-linux-\r
\r
# settings\r
@echo $@\r
@$(OBJCOPY) -O binary $< $@\r
\r
-code940.gpe : $(OBJS940) ../helix/helix_mp3.a\r
+code940.gpe : $(OBJS940) ../../common/helix/helix_mp3.a\r
@echo $@\r
@$(LD) -static -e code940 -Ttext 0x0 $^ -L$(lgcc_path) -lgcc -o $@ -Map code940.map\r
\r
mix.o : ../../../Pico/sound/mix.s\r
@echo $@\r
@$(GCC) $(COPT) $(DEFINC) -DEXTERNAL_YM2612 -c $< -o $@\r
-misc.o : ../../../Pico/misc.s\r
+misc.o : ../../../Pico/Misc.s\r
@echo $@\r
@$(GCC) $(COPT) $(DEFINC) -DEXTERNAL_YM2612 -c $< -o $@\r
\r
-../helix/helix_mp3.a:\r
- @make -C ../helix/\r
+../../common/helix/helix_mp3.a:\r
+ @make -C ../../common/helix/\r
\r
\r
up: $(BIN)\r
+++ /dev/null
-// Some mp3 related code for Sega/Mega CD
-// (c) Copyright 2007, Grazvydas "notaz" Ignotas
-
-#include <stdio.h>
-#include <string.h>
-
-#include "../../Pico/sound/mix.h"
-#include "code940/940shared.h"
-#include "helix/pub/mp3dec.h"
-
-static short mp3_out_buffer[2*1152];
-static HMP3Decoder mp3dec = 0;
-static int mp3_buffer_offs = 0;
-
-extern _940_ctl_t *shared_ctl;
-extern unsigned char *mp3_mem;
-extern int PsndRate;
-
-
-static int try_get_header(unsigned char *buff, MP3FrameInfo *fi)
-{
- int ret, offs1, offs = 0;
-
- while (1)
- {
- offs1 = MP3FindSyncWord(buff + offs, 2048 - offs);
- if (offs1 < 0) return -2;
- offs += offs1;
- if (2048 - offs < 4) return -3;
-
- // printf("trying header %08x\n", *(int *)(buff + offs));
-
- ret = MP3GetNextFrameInfo(mp3dec, fi, buff + offs);
- if (ret == 0 && fi->bitrate != 0) break;
- offs++;
- }
-
- return ret;
-}
-
-int mp3_get_bitrate(FILE *f, int len)
-{
- unsigned char buff[2048];
- MP3FrameInfo fi;
- int ret;
-
- memset(buff, 0, 2048);
-
- if (!mp3dec) mp3dec = MP3InitDecoder();
-
- fseek(f, 0, SEEK_SET);
- ret = fread(buff, 1, 2048, f);
- fseek(f, 0, SEEK_SET);
- if (ret <= 0) return -1;
-
- ret = try_get_header(buff, &fi);
- if (ret != 0 || fi.bitrate == 0) {
- // try to read somewhere around the middle
- fseek(f, len>>1, SEEK_SET);
- fread(buff, 1, 2048, f);
- fseek(f, 0, SEEK_SET);
- ret = try_get_header(buff, &fi);
- }
- if (ret != 0) return ret;
-
- // printf("bitrate: %i\n", fi.bitrate / 1000);
-
- return fi.bitrate / 1000;
-}
-
-
-static void mp3_decode(void)
-{
- // tried copying this to cached mem, no improvement noticed
- int mp3_offs = shared_ctl->mp3_offs;
- unsigned char *readPtr = mp3_mem + mp3_offs;
- int bytesLeft = shared_ctl->mp3_len - mp3_offs;
- int offset; // frame offset from readPtr
- int err;
-
- if (bytesLeft <= 0) return; // EOF, nothing to do
-
- offset = MP3FindSyncWord(readPtr, bytesLeft);
- if (offset < 0) {
- shared_ctl->mp3_offs = shared_ctl->mp3_len;
- return; // EOF
- }
- readPtr += offset;
- bytesLeft -= offset;
-
- err = MP3Decode(mp3dec, &readPtr, &bytesLeft, mp3_out_buffer, 0);
- if (err) {
- if (err == ERR_MP3_INDATA_UNDERFLOW) {
- shared_ctl->mp3_offs = shared_ctl->mp3_len; // EOF
- return;
- } else if (err <= -6 && err >= -12) {
- // ERR_MP3_INVALID_FRAMEHEADER, ERR_MP3_INVALID_*
- // just try to skip the offending frame..
- readPtr++;
- }
- shared_ctl->mp3_errors++;
- shared_ctl->mp3_lasterr = err;
- }
- shared_ctl->mp3_offs = readPtr - mp3_mem;
-}
-
-
-void mp3_update_local(int *buffer, int length, int stereo)
-{
- int length_mp3, shr = 0;
- void (*mix_samples)(int *dest_buf, short *mp3_buf, int count) = mix_16h_to_32;
-
- length_mp3 = length;
- if (PsndRate == 22050) { mix_samples = mix_16h_to_32_s1; length_mp3 <<= 1; shr = 1; }
- else if (PsndRate == 11025) { mix_samples = mix_16h_to_32_s2; length_mp3 <<= 2; shr = 2; }
-
- if (1152 - mp3_buffer_offs >= length_mp3) {
- mix_samples(buffer, mp3_out_buffer + mp3_buffer_offs*2, length<<1);
-
- mp3_buffer_offs += length_mp3;
- } else {
- int left = 1152 - mp3_buffer_offs;
-
- mix_samples(buffer, mp3_out_buffer + mp3_buffer_offs*2, (left>>shr)<<1);
- mp3_decode();
- mp3_buffer_offs = length_mp3 - left;
- mix_samples(buffer + ((left>>shr)<<1), mp3_out_buffer, (mp3_buffer_offs>>shr)<<1);
- }
-}
-
-
-void mp3_start_local(void)
-{
- mp3_buffer_offs = 0;
- mp3_decode();
-}
-
notaz.gp2x.de / picodrive.git / commitdiff