From: notaz <notasas@gmail.com>
Date: Sun, 2 Aug 2009 19:42:12 +0000 (+0000)
Subject: unify helix mp3 code, some sound adjustments
X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9615b3dfdededf2b7d74963137b6ff9495e4d21e;p=libpicofe.git
unify helix mp3 code, some sound adjustments
git-svn-id: file:///home/notaz/opt/svn/PicoDrive/platform@726 be3aeb3a-fb24-0410-a615-afba39da0efa
---
diff --git a/common/mp3.h b/common/mp3.h
index aef65ff..31b8d6f 100644
--- a/common/mp3.h
+++ b/common/mp3.h
@@ -1,6 +1,6 @@
#ifdef __GP2X__
void mp3_update_local(int *buffer, int length, int stereo);
-void mp3_start_local(void);
+void mp3_start_play_local(FILE *f, int pos);
#endif
diff --git a/common/mp3_helix.c b/common/mp3_helix.c
index 718c3de..5f58aa5 100644
--- a/common/mp3_helix.c
+++ b/common/mp3_helix.c
@@ -6,14 +6,22 @@
#include <stdio.h>
#include <string.h>
-#include "../../pico/pico_int.h"
-#include "../../pico/sound/mix.h"
+#include <pico/pico_int.h>
+#include <pico/sound/mix.h>
#include "helix/pub/mp3dec.h"
+#include "mp3.h"
#include "lprintf.h"
static HMP3Decoder mp3dec = 0;
+static FILE *mp3_current_file = NULL;
+static int mp3_file_len = 0, mp3_file_pos = 0;
static int mp3_buffer_offs = 0;
+static unsigned char mp3_input_buffer[2*1024];
+#ifdef __GP2X__
+#define mp3_update mp3_update_local
+#define mp3_start_play mp3_start_play_local
+#endif
static int find_sync_word(unsigned char *buf, int nBytes)
{
@@ -41,7 +49,6 @@ static int find_sync_word(unsigned char *buf, int nBytes)
return -1;
}
-
static int try_get_header(unsigned char *buff, MP3FrameInfo *fi)
{
int ret, offs1, offs = 0;
@@ -94,111 +101,54 @@ int mp3_get_bitrate(FILE *f, int len)
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 retries = 0, err;
-
- if (bytesLeft <= 0) return 1; // EOF, nothing to do
-
-retry:
- offset = find_sync_word(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, cdda_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++;
- 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;
- }
- shared_ctl->mp3_offs = readPtr - mp3_mem;
- return 0;
-}
-
-void mp3_start_local(void)
-{
- // must re-init decoder for new track
- if (mp3dec) MP3FreeDecoder(mp3dec);
- mp3dec = MP3InitDecoder();
-
- mp3_buffer_offs = 0;
- mp3_decode();
-}
-
-#define mp3_update mp3_update_local
-
-#else // !__GP2X__
-
-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;
+ int had_err;
+ int err = 0;
do
{
- if (mp3_file_pos >= mp3_file_len) return 1; // EOF, nothing to 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 = 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);
+ 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
}
readPtr = mp3_input_buffer + offset;
bytesLeft -= offset;
+ had_err = err;
err = MP3Decode(mp3dec, &readPtr, &bytesLeft, cdda_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 (err == ERR_MP3_MAINDATA_UNDERFLOW && !had_err) {
+ // just need another frame
+ mp3_file_pos += readPtr - mp3_input_buffer;
+ continue;
+ }
+ if (err == ERR_MP3_INDATA_UNDERFLOW && !had_err) {
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) {
+ }
+ if (-12 <= err && err <= -6) {
// ERR_MP3_INVALID_FRAMEHEADER, ERR_MP3_INVALID_*
// just try to skip the offending frame..
mp3_file_pos += offset + 1;
continue;
}
+ lprintf("MP3Decode err (%i/%i) %i\n", mp3_file_pos, mp3_file_len, err);
mp3_file_pos = mp3_file_len;
return 1;
}
@@ -215,14 +165,13 @@ 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?
+ if (!(PicoOpt & POPT_EN_MCD_CDDA) || f == NULL) // cdda disabled or no file?
return;
- //lprintf("mp3_start_play %p %i\n", f, pos);
+ // must re-init decoder for new track
+ if (mp3dec)
+ MP3FreeDecoder(mp3dec);
+ mp3dec = MP3InitDecoder();
mp3_current_file = f;
fseek(f, 0, SEEK_END);
@@ -230,41 +179,21 @@ void mp3_start_play(FILE *f, int pos)
// seek..
if (pos) {
- mp3_file_pos = (mp3_file_len << 6) >> 10;
- mp3_file_pos *= pos;
- mp3_file_pos >>= 6;
+ unsigned long long pos64 = mp3_file_len;
+ pos64 *= pos;
+ mp3_file_pos = pos64 >> 10;
}
mp3_decode();
}
-int mp3_get_offset(void)
-{
- unsigned int offs1024 = 0;
- int cdda_on;
-
- cdda_on = (PicoAHW & PAHW_MCD) && (PicoOpt&POPT_EN_MCD_CDDA) && !(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
+ if (mp3_current_file == NULL || mp3_file_pos >= mp3_file_len)
+ return; /* no file / EOF */
length_mp3 = length;
if (PsndRate == 22050) { mix_samples = mix_16h_to_32_s1; length_mp3 <<= 1; shr = 1; }
@@ -287,4 +216,3 @@ void mp3_update(int *buffer, int length, int stereo)
}
}
-
diff --git a/gp2x/940ctl.c b/gp2x/940ctl.c
index 38a9f9d..afd653f 100644
--- a/gp2x/940ctl.c
+++ b/gp2x/940ctl.c
@@ -405,24 +405,24 @@ int YM2612UpdateOne_940(int *buffer, int length, int stereo, int is_buf_empty)
}
+/***********************************************************/
+
static int mp3_samples_ready = 0, mp3_buffer_offs = 0;
static int mp3_play_bufsel = 0, mp3_job_started = 0;
void mp3_update(int *buffer, int length, int stereo)
{
int length_mp3;
- int cdda_on;
-
- // playback was started, track not ended
- cdda_on = loaded_mp3 && shared_ctl->mp3_offs < shared_ctl->mp3_len;
- if (!cdda_on) return;
-
- if (!(PicoOpt&0x200)) {
+ if (!(PicoOpt & POPT_EXT_FM)) {
mp3_update_local(buffer, length, stereo);
return;
}
+ // check if playback was started, track not ended
+ if (loaded_mp3 == NULL || shared_ctl->mp3_offs >= shared_ctl->mp3_len)
+ return;
+
length_mp3 = length;
if (PsndRate == 22050) length_mp3 <<= 1; // mp3s are locked to 44100Hz stereo
else if (PsndRate == 11025) length_mp3 <<= 2; // so make length 44100ish
@@ -475,13 +475,15 @@ void mp3_update(int *buffer, int length, int stereo)
}
-/***********************************************************/
-
void mp3_start_play(FILE *f, int pos) // pos is 0-1023
{
int byte_offs = 0;
- if (!(PicoOpt&0x800)) { // cdda disabled?
+ if (!(PicoOpt & POPT_EN_MCD_CDDA) || f == NULL)
+ return;
+
+ if (!(PicoOpt & POPT_EXT_FM)) {
+ mp3_start_play_local(f, pos);
return;
}
@@ -522,31 +524,7 @@ 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 & POPT_EXT_FM)
- {
- add_job_940(JOB940_MP3RESET);
- if (CHECK_BUSY(JOB940_MP3RESET)) wait_busy_940(JOB940_MP3RESET);
- }
- else
- mp3_start_local();
-}
-
-
-int mp3_get_offset(void)
-{
- unsigned int offs1024 = 0;
- int cdda_on;
-
- cdda_on = (PicoAHW & PAHW_MCD) && (PicoOpt&0x800) && !(Pico_mcd->s68k_regs[0x36] & 1) &&
- (Pico_mcd->scd.Status_CDC & 1) && loaded_mp3;
-
- if (cdda_on) {
- offs1024 = shared_ctl->mp3_offs << 7;
- offs1024 /= shared_ctl->mp3_len >> 3;
- }
- printf("offs1024=%u (%i/%i)\n", offs1024, shared_ctl->mp3_offs, shared_ctl->mp3_len);
-
- return offs1024;
+ add_job_940(JOB940_MP3RESET);
+ if (CHECK_BUSY(JOB940_MP3RESET)) wait_busy_940(JOB940_MP3RESET);
}
-
diff --git a/gp2x/emu.c b/gp2x/emu.c
index 372ce56..0700e81 100644
--- a/gp2x/emu.c
+++ b/gp2x/emu.c
@@ -409,6 +409,7 @@ void plat_status_msg_busy_next(const char *msg)
{
plat_status_msg_clear();
pemu_update_display("", msg);
+ emu_status_msg("");
/* assumption: msg_busy_next gets called only when
* something slow is about to happen */
@@ -600,22 +601,26 @@ static void updateSound(int len)
void pemu_sound_start(void)
{
static int PsndRate_old = 0, PicoOpt_old = 0, pal_old = 0;
- int target_fps = Pico.m.pal ? 50 : 60;
PsndOut = NULL;
// prepare sound stuff
- if (currentConfig.EmuOpt & 4)
+ if (currentConfig.EmuOpt & EOPT_EN_SOUND)
{
+ int is_stereo = (PicoOpt & POPT_EN_STEREO) ? 1 : 0;
+ int target_fps = Pico.m.pal ? 50 : 60;
int snd_excess_add;
- if (PsndRate != PsndRate_old || (PicoOpt&0x20b) != (PicoOpt_old&0x20b) || Pico.m.pal != pal_old ||
- ((PicoOpt&0x200) && crashed_940)) {
+ gp2x_soc_t soc;
+
+ #define SOUND_RERATE_FLAGS (POPT_EN_FM|POPT_EN_PSG|POPT_EN_STEREO|POPT_EXT_FM|POPT_EN_MCD_CDDA)
+ if (PsndRate != PsndRate_old || Pico.m.pal != pal_old || ((PicoOpt & POPT_EXT_FM) && crashed_940) ||
+ ((PicoOpt ^ PicoOpt_old) & SOUND_RERATE_FLAGS)) {
PsndRerate(Pico.m.frame_count ? 1 : 0);
}
- snd_excess_add = ((PsndRate - PsndLen*target_fps)<<16) / target_fps;
+ snd_excess_add = ((PsndRate - PsndLen * target_fps)<<16) / target_fps;
printf("starting audio: %i len: %i (ex: %04x) stereo: %i, pal: %i\n",
- PsndRate, PsndLen, snd_excess_add, (PicoOpt&8)>>3, Pico.m.pal);
- sndout_oss_start(PsndRate, 16, (PicoOpt&8)>>3);
+ PsndRate, PsndLen, snd_excess_add, is_stereo, Pico.m.pal);
+ sndout_oss_start(PsndRate, 16, is_stereo);
sndout_oss_setvol(currentConfig.volume, currentConfig.volume);
PicoWriteSound = updateSound;
plat_update_volume(0, 0);
@@ -624,6 +629,11 @@ void pemu_sound_start(void)
PsndRate_old = PsndRate;
PicoOpt_old = PicoOpt;
pal_old = Pico.m.pal;
+
+ /* Wiz's sound hardware needs more prebuffer */
+ soc = soc_detect();
+ if (soc == SOCID_POLLUX)
+ updateSound(PsndLen);
}
}