#include <pspdisplay.h>
#include <psputils.h>
#include <pspgu.h>
+#include <pspaudio.h>
#include "psp.h"
#include "menu.h"
#include "../common/lprintf.h"
#include "../../Pico/PicoInt.h"
-#ifdef BENCHMARK
-#define OSD_FPS_X 380
-#else
-#define OSD_FPS_X 420
-#endif
+#define OSD_FPS_X 424
+
+// additional pspaudio imports, credits to crazyc
+int sceAudio_38553111(unsigned short samples, unsigned short freq, char unknown); // play with conversion?
+int sceAudio_5C37C0AE(void); // end play?
+int sceAudio_E0727056(int volume, void *buffer); // blocking output
+int sceAudioOutput2GetRestSample();
+
char romFileName[PATH_MAX];
unsigned char *PicoDraw2FB = (unsigned char *)VRAM_CACHED_STUFF + 8; // +8 to be able to skip border with 1 quadword..
int reset_timing = 0; // do we need this?
-static void blit2(const char *fps, const char *notice);
+static void sound_init(void);
+static void sound_deinit(void);
+static void blit2(const char *fps, const char *notice, int lagging_behind);
static void clearArea(int full);
void emu_noticeMsgUpdated(void)
mkdir("brm", 0777);
mkdir("cfg", 0777);
+ sound_init();
+
PicoInit();
PicoMessage = emu_msg_cb;
PicoMCDopenTray = emu_msg_tray_open;
}
PicoExit();
+ sound_deinit();
}
void emu_setDefaultConfig(void)
memset(¤tConfig, 0, sizeof(currentConfig));
currentConfig.lastRomFile[0] = 0;
currentConfig.EmuOpt = 0x1f | 0x680; // | confirm_save, cd_leds, 16bit rend
- currentConfig.PicoOpt = 0x07 | 0xc00; // | cd_pcm, cd_cdda
+ currentConfig.PicoOpt = 0x0f | 0xc00; // | cd_pcm, cd_cdda
currentConfig.PsndRate = 22050;
currentConfig.PicoRegion = 0; // auto
currentConfig.PicoAutoRgnOrder = 0x184; // US, EU, JP
currentConfig.Frameskip = -1; // auto
currentConfig.volume = 50;
- currentConfig.CPUclock = 222;
+ currentConfig.CPUclock = 333;
currentConfig.KeyBinds[ 4] = 1<<0; // SACB RLDU
currentConfig.KeyBinds[ 6] = 1<<1;
currentConfig.KeyBinds[ 7] = 1<<2;
currentConfig.KeyBinds[13] = 1<<5;
currentConfig.KeyBinds[15] = 1<<6;
currentConfig.KeyBinds[ 3] = 1<<7;
+ currentConfig.KeyBinds[12] = 1<<26; // switch rnd
currentConfig.KeyBinds[ 8] = 1<<27; // save state
currentConfig.KeyBinds[ 9] = 1<<28; // load state
currentConfig.PicoCDBuffers = 0;
if (fbimg_yoffs < 0) fbimg_yoffs = 0;
fbimg_offs = (fbimg_yoffs*512 + fbimg_xoffs) * 2; // dst is always 16bit
+ /*
lprintf("set_scaling_params:\n");
lprintf("offs: %i, %i\n", fbimg_xoffs, fbimg_yoffs);
lprintf("xy0, xy1: %i, %i; %i, %i\n", g_vertices[0].x, g_vertices[0].y, g_vertices[1].x, g_vertices[1].y);
lprintf("uv0, uv1: %i, %i; %i, %i\n", g_vertices[0].u, g_vertices[0].v, g_vertices[1].u, g_vertices[1].v);
+ */
}
-static void do_slowmode_pal(void)
+static void do_pal_update(int allow_sh)
{
unsigned int *spal=(void *)Pico.cram;
unsigned int *dpal=(void *)localPal;
for (i = 0x3f/2; i >= 0; i--)
dpal[i] = ((spal[i]&0x000f000f)<< 1)|((spal[i]&0x00f000f0)<<3)|((spal[i]&0x0f000f00)<<4);
- if (Pico.video.reg[0xC]&8) // shadow/hilight?
+ if (allow_sh && (Pico.video.reg[0xC]&8)) // shadow/hilight?
{
// shadowed pixels
for (i = 0x3f/2; i >= 0; i--)
- dpal[0x20|i] = dpal[0x60|i] = (spal[i]>>1)&0x738e738e;
+ dpal[0x20|i] = dpal[0x60|i] = (dpal[i]>>1)&0x738e738e;
// hilighted pixels
for (i = 0x3f; i >= 0; i--) {
int t=localPal[i]&0xe71c;t+=0x4208;
dynamic_palette = 0;
if (Pico.m.dirtyPal)
- do_slowmode_pal();
+ do_pal_update(1);
}
static int EmuScanSlow(unsigned int num, void *sdata)
do_slowmode_lines(num);
dynamic_palette = 1;
}
- do_slowmode_pal();
+ do_pal_update(1);
}
if (dynamic_palette) {
int offs = fbimg_offs;
offs += (psp_screen == VRAM_FB0) ? VRAMOFFS_FB0 : VRAMOFFS_FB1;
- sceKernelDcacheWritebackAll();
-
sceGuSync(0,0); // sync with prev
sceGuStart(GU_DIRECT, guCmdList);
sceGuDrawBuffer(GU_PSM_5650, (void *)offs, 512); // point to back buffer
}
if ((PicoOpt&0x10) && Pico.m.dirtyPal)
- {
- int i, *dpal = (void *)localPal, *spal = (int *)Pico.cram;
- for (i = 0x3f/2; i >= 0; i--)
- dpal[i] = ((spal[i]&0x000f000f)<< 1)|((spal[i]&0x00f000f0)<<3)|((spal[i]&0x0f000f00)<<4);
- localPal[0xe0] = 0;
- Pico.m.dirtyPal = 0;
- need_pal_upload = 1;
- }
+ do_pal_update(0);
+
+ sceKernelDcacheWritebackAll();
if (need_pal_upload) {
need_pal_upload = 0;
p = (unsigned int *)((short *)psp_screen + 512*2+4+2);
col_g = (old_reg & 2) ? 0x06000600 : 0;
- col_r = (old_reg & 1) ? 0xc000c000 : 0;
+ col_r = (old_reg & 1) ? 0x00180018 : 0;
*p++ = col_g; *p++ = col_g; p+=2; *p++ = col_r; *p++ = col_r; p += 512/2 - 12/2;
*p++ = col_g; *p++ = col_g; p+=2; *p++ = col_r; *p++ = col_r; p += 512/2 - 12/2;
*p++ = col_g; *p++ = col_g; p+=2; *p++ = col_r; *p++ = col_r;
}
-static void blit2(const char *fps, const char *notice)
+static void blit2(const char *fps, const char *notice, int lagging_behind)
{
- int emu_opt = currentConfig.EmuOpt;
-
- sceGuSync(0,0);
+ int vsync = 0, emu_opt = currentConfig.EmuOpt;
if (notice || (emu_opt & 2)) {
if (notice) osd_text(4, notice, 0);
if ((emu_opt & 0x400) && (PicoMCD & 1))
cd_leds();
- psp_video_flip(0);
+ if (currentConfig.EmuOpt & 0x2000) { // want vsync
+ if (!(currentConfig.EmuOpt & 0x10000) || !lagging_behind) vsync = 1;
+ }
+
+ psp_video_flip(vsync);
}
// clears whole screen or just the notice area (in all buffers)
sceGuSync(0,0);
}
-/*
-static void updateSound(int len)
+
+/* sound stuff */
+#define SOUND_BLOCK_SIZE_NTSC (1470*2) // 1024 // 1152
+#define SOUND_BLOCK_SIZE_PAL (1764*2)
+#define SOUND_BLOCK_COUNT 4
+
+static short __attribute__((aligned(4))) sndBuffer[SOUND_BLOCK_SIZE_PAL*SOUND_BLOCK_COUNT + 44100/50*2];
+static short *snd_playptr = NULL, *sndBuffer_endptr = NULL;
+static int samples_made = 0, samples_done = 0, samples_block = 0;
+static int sound_thread_exit = 0;
+static SceUID sound_sem = -1;
+
+static void writeSound(int len);
+
+static int sound_thread(SceSize args, void *argp)
+{
+ int ret;
+
+ lprintf("sthr: started, priority %i\n", sceKernelGetThreadCurrentPriority());
+
+ while (!sound_thread_exit)
+ {
+ if (samples_made - samples_done < samples_block) {
+ // wait for data (use at least 2 blocks)
+ //lprintf("sthr: wait... (%i)\n", samples_made - samples_done);
+ while (samples_made - samples_done <= samples_block*2 && !sound_thread_exit)
+ ret = sceKernelWaitSema(sound_sem, 1, 0);
+ //lprintf("sthr: sceKernelWaitSema: %i\n", ret);
+ continue;
+ }
+
+ //lprintf("sthr: got data: %i\n", samples_made - samples_done);
+
+ ret = sceAudio_E0727056(PSP_AUDIO_VOLUME_MAX, snd_playptr);
+
+ samples_done += samples_block;
+ snd_playptr += samples_block;
+ if (snd_playptr >= sndBuffer_endptr)
+ snd_playptr = sndBuffer;
+ if (ret)
+ lprintf("sthr: outf: %i; pos %i/%i\n", ret, samples_done, samples_made);
+
+ // shouln't happen, but just in case
+ if (samples_made - samples_done >= samples_block*3) {
+ //lprintf("block skip (%i)\n", samples_made - samples_done);
+ samples_done += samples_block; // skip
+ snd_playptr += samples_block;
+ }
+
+ }
+
+ lprintf("sthr: exit\n");
+ sceKernelExitDeleteThread(0);
+ return 0;
+}
+
+static void sound_init(void)
{
+ SceUID thid;
+
+ sound_sem = sceKernelCreateSema("sndsem", 0, 0, 1, NULL);
+ if (sound_sem < 0) lprintf("sceKernelCreateSema() failed: %i\n", sound_sem);
+
+ samples_made = samples_done = 0;
+ samples_block = SOUND_BLOCK_SIZE_NTSC; // make sure it goes to sema
+ sound_thread_exit = 0;
+ thid = sceKernelCreateThread("sndthread", sound_thread, 0x12, 0x10000, 0, NULL);
+ if (thid >= 0)
+ {
+ sceKernelStartThread(thid, 0, 0);
+ }
+ else
+ lprintf("sceKernelCreateThread failed: %i\n", thid);
+}
+
+static void sound_prepare(void)
+{
+ static int PsndRate_old = 0, PicoOpt_old = 0, pal_old = 0;
+ int ret, stereo;
+
+ samples_made = samples_done = 0;
+
+ if (PsndRate != PsndRate_old || (PicoOpt&0x0b) != (PicoOpt_old&0x0b) || Pico.m.pal != pal_old) {
+ PsndRerate(Pico.m.frame_count ? 1 : 0);
+ }
+ stereo=(PicoOpt&8)>>3;
+
+ samples_block = Pico.m.pal ? SOUND_BLOCK_SIZE_PAL : SOUND_BLOCK_SIZE_NTSC;
+ if (PsndRate <= 22050) samples_block /= 2;
+ sndBuffer_endptr = &sndBuffer[samples_block*SOUND_BLOCK_COUNT];
+
+ lprintf("starting audio: %i, len: %i, stereo: %i, pal: %i, block samples: %i\n",
+ PsndRate, PsndLen, stereo, Pico.m.pal, samples_block);
+
+ while (sceAudioOutput2GetRestSample() > 0) psp_msleep(100);
+ sceAudio_5C37C0AE();
+ ret = sceAudio_38553111(samples_block/2, PsndRate, 2); // seems to not need that stupid 64byte alignment
+ if (ret < 0) {
+ lprintf("sceAudio_38553111() failed: %i\n", ret);
+ sprintf(noticeMsg, "sound init failed (%i), snd disabled", ret);
+ noticeMsgTime = sceKernelGetSystemTimeLow();
+ currentConfig.EmuOpt &= ~4;
+ } else {
+ PicoWriteSound = writeSound;
+ memset32((int *)(void *)sndBuffer, 0, sizeof(sndBuffer)/4);
+ snd_playptr = sndBuffer_endptr - samples_block;
+ samples_made = samples_block; // send 1 empty block first..
+ PsndOut = sndBuffer;
+ PsndRate_old = PsndRate;
+ PicoOpt_old = PicoOpt;
+ pal_old = Pico.m.pal;
+ }
+}
+
+static void sound_end(void)
+{
+ samples_made = samples_done = 0;
+ while (sceAudioOutput2GetRestSample() > 0)
+ psp_msleep(100);
+ sceAudio_5C37C0AE();
+}
+
+static void sound_deinit(void)
+{
+ sound_thread_exit = 1;
+ sceKernelSignalSema(sound_sem, 1);
+ sceKernelDeleteSema(sound_sem);
+ sound_sem = -1;
+}
+
+static void writeSound(int len)
+{
+ int ret;
if (PicoOpt&8) len<<=1;
- // TODO..
+ PsndOut += len;
+ /*if (PsndOut > sndBuffer_endptr) {
+ memcpy32((int *)(void *)sndBuffer, (int *)endptr, (PsndOut - endptr + 1) / 2);
+ PsndOut = &sndBuffer[PsndOut - endptr];
+ lprintf("mov\n");
+ }
+ else*/
+ if (PsndOut >= sndBuffer_endptr)
+ PsndOut = sndBuffer;
+
+ // signal the snd thread
+ samples_made += len;
+ if (samples_made - samples_done > samples_block*2) {
+ // lprintf("signal, %i/%i\n", samples_done, samples_made);
+ ret = sceKernelSignalSema(sound_sem, 1);
+ // lprintf("signal ret %i\n", ret);
+ }
}
-*/
+
static void SkipFrame(void)
{
vidResetMode();
memset32(VRAM_CACHED_STUFF, 0xe0e0e0e0, 512*8/4); // borders
memset32((int *)VRAM_CACHED_STUFF + 512*232/4, 0xe0e0e0e0, 512*8/4);
+ memset32((int *)psp_screen + 512*264*2/4, 0, 512*8*2/4);
PicoDrawSetColorFormat(-1);
PicoScan = EmuScanSlow;
(!(which & 0x1000) && (currentConfig.EmuOpt & 0x200))) ) // save
{
int keys;
- blit2("", (which & 0x1000) ? "LOAD STATE? (X=yes, O=no)" : "OVERWRITE SAVE? (X=yes, O=no)");
+ sceGuSync(0,0);
+ blit2("", (which & 0x1000) ? "LOAD STATE? (X=yes, O=no)" : "OVERWRITE SAVE? (X=yes, O=no)", 0);
while( !((keys = psp_pad_read(1)) & (BTN_X|BTN_CIRCLE)) )
psp_msleep(50);
if (keys & BTN_CIRCLE) do_it = 0;
vidResetMode();
- if (PicoOpt&0x10) {
- strcpy(noticeMsg, " 8bit fast renderer");
- } else if (currentConfig.EmuOpt&0x80) {
- strcpy(noticeMsg, "16bit accurate renderer");
- } else {
- strcpy(noticeMsg, " 8bit accurate renderer");
- }
+ if (PicoOpt&0x10)
+ strcpy(noticeMsg, "fast renderer");
+ else if (currentConfig.EmuOpt&0x80)
+ strcpy(noticeMsg, "accurate renderer");
noticeMsgTime = sceKernelGetSystemTimeLow();
}
void emu_Loop(void)
{
- //static int PsndRate_old = 0, PicoOpt_old = 0, pal_old = 0;
char fpsbuff[24]; // fps count c string
unsigned int tval, tval_prev = 0, tval_thissec = 0; // timing
int frames_done = 0, frames_shown = 0, oldmodes = 0;
// prepare sound stuff
PsndOut = NULL;
-#if 0 // TODO
if (currentConfig.EmuOpt & 4)
{
- 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",
- PsndRate, PsndLen, snd_excess_add, stereo, Pico.m.pal);
- ret = FrameworkAudio_Init(PsndRate, snd_cbuf_samples, stereo);
- if (ret != 0) {
- lprintf("FrameworkAudio_Init() failed: %i\n", ret);
- sprintf(noticeMsg, "sound init failed (%i), snd disabled", ret);
- noticeMsgTime = sceKernelGetSystemTimeLow();
- currentConfig.EmuOpt &= ~4;
- } else {
- FrameworkAudio_SetVolume(currentConfig.volume, currentConfig.volume);
- PicoWriteSound = updateSound;
- snd_cbuff = FrameworkAudio_56448Buffer();
- PsndOut = snd_cbuff + snd_cbuf_samples / 2; // start writing at the middle
- snd_all_samples = 0;
- PsndRate_old = PsndRate;
- PicoOpt_old = PicoOpt;
- pal_old = Pico.m.pal;
- }
+ sound_prepare();
}
-#endif
// loop?
while (engineState == PGS_Running)
// second passed?
if (tval - tval_thissec >= 1000000)
{
-#ifdef BENCHMARK
- static int bench = 0, bench_fps = 0, bench_fps_s = 0, bfp = 0, bf[4];
- if(++bench == 10) {
- bench = 0;
- bench_fps_s = bench_fps;
- bf[bfp++ & 3] = bench_fps;
- bench_fps = 0;
+ // missing 1 frame?
+ if (currentConfig.Frameskip < 0 && frames_done < target_fps) {
+ SkipFrame(); frames_done++;
}
- bench_fps += frames_shown;
- sprintf(fpsbuff, "%02i/%02i/%02i", frames_shown, bench_fps_s, (bf[0]+bf[1]+bf[2]+bf[3])>>2);
-#else
- if(currentConfig.EmuOpt & 2)
- sprintf(fpsbuff, "%02i/%02i", frames_shown, frames_done);
-#endif
+
+ if (currentConfig.EmuOpt & 2)
+ sprintf(fpsbuff, "%02i/%02i ", frames_shown, frames_done);
+
tval_thissec += 1000000;
if (currentConfig.Frameskip < 0) {
int tval_diff;
tval = sceKernelGetSystemTimeLow();
tval_diff = (int)(tval - tval_thissec) << 8;
- if (tval_diff > lim_time)
+ if (tval_diff > lim_time && (frames_done/16 < frames_shown))
{
// no time left for this frame - skip
if (tval_diff - lim_time >= (300000<<8)) {
- /* something caused a slowdown for us (disk access? cache flush?)
- * try to recover by resetting timing... */
reset_timing = 1;
continue;
}
PicoFrame();
- blit2(fpsbuff, notice);
+ sceGuSync(0,0);
// check time
tval = sceKernelGetSystemTimeLow();
tval_diff = (int)(tval - tval_thissec) << 8;
+ blit2(fpsbuff, notice, tval_diff > lim_time);
+
if (currentConfig.Frameskip < 0 && tval_diff - lim_time >= (300000<<8)) // slowdown detection
reset_timing = 1;
else if (PsndOut != NULL || currentConfig.Frameskip < 0)
if (PicoMCD & 1) PicoCDBufferFree();
-/*
+
if (PsndOut != NULL) {
- PsndOut = snd_cbuff = NULL;
- FrameworkAudio_Close();
+ PsndOut = NULL;
+ sound_end();
}
-*/
+
// save SRAM
if ((currentConfig.EmuOpt & 1) && SRam.changed) {
emu_msg_cb("Writing SRAM/BRAM..");
emu_SaveLoadGame(0, 1);
SRam.changed = 0;
}
+
+ // clear fps counters and stuff
+ memset32((int *)psp_video_get_active_fb() + 512*264*2/4, 0, 512*8*2/4);
}
notaz.gp2x.de / picodrive.git / blobdiff