common: improve audio handling

psnes: add AUDIO_SYNC option (on: perfect audio, off: minor audio stuttering in favor of fps)
Cpasjuste · May 11, 2022 · a31e1c2 · a31e1c2
1 parent acb9224
commit a31e1c2
Show file tree

Hide file tree

Showing 10 changed files with 95 additions and 187 deletions.
diff --git a/libcross2d b/libcross2d
diff --git a/pfbneo/sources/fbneo/retro_input_wrapper.h b/pfbneo/sources/fbneo/retro_input_wrapper.h
@@ -30,7 +30,7 @@ void poll_cb();
 
 #define RETRO_GAME_TYPE_NEOCD    13
 #define HARDWARE_SEGA_SYSTEM32 (HARDWARE_PREFIX_SEGA | 0x000c0000)
-#define HARDWARE_NVS (HARDWARE_PREFIX_NES | 0x00010000)
+//#define HARDWARE_NVS (HARDWARE_PREFIX_NES | 0x00010000)
 
 #define RETRO_DEVICE_TYPE_SHIFT         8
 #define RETRO_DEVICE_MASK               ((1 << RETRO_DEVICE_TYPE_SHIFT) - 1)

diff --git a/pfbneo/sources/uiEmu.cpp b/pfbneo/sources/uiEmu.cpp
@@ -205,9 +205,8 @@ int PFBAUiEmu::load(const ss_api::Game &game) {
         pBurnSoundOut = (INT16 *) malloc(audio->getSamplesSize());
     }
     audio_sync = !bForce60Hz;
-    targetFps = (float) nBurnFPS / 100;
-    printf("PFBAUiEmu::load: FORCE_60HZ: %i, AUDIO_SYNC: %i, FPS: %f (BURNFPS: %f)\n",
-           bForce60Hz, audio_sync, (float) nBurnFPS / 100.0f, targetFps);
+    targetFps = (float) nBurnFPS / 100.0f;
+    printf("PFBAUiEmu::load: FORCE_60HZ: %i, AUDIO_SYNC: %i, FPS: %f\n", bForce60Hz, audio_sync, targetFps);
     ///////////
     // AUDIO
     //////////
@@ -375,8 +374,17 @@ void PFBAUiEmu::onUpdate() {
         frameskip = 0;
     }
 
-    if (audio && audio->isAvailable()) {
-        audio->play(pBurnSoundOut, audio->getSamples(), audio_sync);
+    if (audio) {
+#if 0
+        int queued = audio->getSampleBufferQueued();
+        int capacity = audio->getSampleBufferCapacity();
+        if (audio->getSamples() + queued > capacity) {
+            printf("WARNING: samples: %i, queued: %i, capacity: %i (fps: %f)\n",
+                   audio->getSamples(), queued, capacity, targetFps);
+        }
+#endif
+        audio->play(pBurnSoundOut, audio->getSamples(),
+                    audio_sync ? Audio::SyncMode::LowLatency : Audio::SyncMode::None);
     }
 
     UiEmu::onUpdate();

diff --git a/pgen/sources/pgen_ui_emu.cpp b/pgen/sources/pgen_ui_emu.cpp
@@ -79,8 +79,7 @@ int PGENUiEmu::load(const ss_api::Game &game) {
 
     // audio init
     targetFps = vdp_pal ? 50 : 60;
-    int samples = 48000 / (int) targetFps;
-    addAudio(48000, samples);
+    addAudio(48000, vdp_pal ? 966 : 801);
 
     getUi()->getUiProgressBox()->setProgress(1);
     getUi()->flip();
@@ -166,7 +165,16 @@ void PGENUiEmu::onUpdate() {
 
         // audio
         int samples = audio_update(sound_buffer);
-        getAudio()->play(sound_buffer, samples, vdp_pal);
+#if 0
+        int queued = audio->getSampleBufferQueued();
+        int capacity = audio->getSampleBufferCapacity();
+        if (samples + queued > capacity) {
+            printf("WARNING: samples: %i, queued: %i, capacity: %i (fps: %i)\n",
+                   samples, queued, capacity, vdp_pal ? 50 : 60);
+        }
+#endif
+        getAudio()->play(sound_buffer, samples,
+                         vdp_pal ? Audio::SyncMode::Safe : Audio::SyncMode::None);
     }
 
     return UiEmu::onUpdate();

diff --git a/pnes/sources/uiEmu.cpp b/pnes/sources/uiEmu.cpp
@@ -145,14 +145,19 @@ void audio_deinit() {
 }
 
 void audio_queue() {
-    if (uiEmu->getAudio()) {
+    Audio *audio = uiEmu->getAudio();
+    if (audio) {
 #if 0
-        printf("play: samples: %i, queued: %i, capacity: %i\n",
-               uiEmu->getAudio()->getSamples(),
-               uiEmu->getAudio()->getSampleBufferQueued(),
-               uiEmu->getAudio()->getSampleBufferCapacity());
+        int samples = uiEmu->getAudio()->getSamples();
+        int queued = audio->getSampleBufferQueued();
+        int capacity = audio->getSampleBufferCapacity();
+        if (samples + queued > capacity) {
+            printf("WARNING: samples: %i, queued: %i, capacity: %i (fps: %i)\n",
+                   samples, queued, capacity, nst_pal() ? 50 : 60);
+        }
 #endif
-        uiEmu->getAudio()->play(audio_buffer, uiEmu->getAudio()->getSamples(), nst_pal());
+        uiEmu->getAudio()->play(audio_buffer, uiEmu->getAudio()->getSamples(),
+                                nst_pal() ? Audio::SyncMode::LowLatency : Audio::SyncMode::None);
     }
 }
 

diff --git a/psnes/sources/config.cpp b/psnes/sources/config.cpp
@@ -9,10 +9,13 @@ using namespace c2d;
 using namespace c2dui;
 
 PSNESConfig::PSNESConfig(c2d::Io *io, int version) : Config(io, version) {
-
     printf("PSNESConfig(%s, v%i)\n", getConfigPath().c_str(), version);
 
-    add(Option::Id::ROM_SHOW_FPS, "CHEATS", {"OFF", "ON"}, 1,
+    add(Option::Id::ROM_SHOW_FPS, "AUDIO_SYNC", {"OFF", "ON"}, 0,
+        Option::Id::ROM_AUDIO_SYNC, Option::Flags::BOOLEAN);
+    get(Option::Id::ROM_AUDIO_SYNC)->setInfo("ON: PERFECT AUDIO - OFF: MINOR AUDIO STUTTERING (FAVOR FPS)");
+
+    add(Option::Id::ROM_AUDIO_SYNC, "CHEATS", {"OFF", "ON"}, 1,
         Option::Id::ROM_PSNES_CHEATS, Option::Flags::BOOLEAN);
 
     add(Option::Id::ROM_PSNES_CHEATS, "BLOCk_INVALID_VRAM", {"OFF", "ON"}, 1,
+8 −2		include/cross2d/skeleton/audio.h
+4 −14		include/cross2d/skeleton/renderer.h
+2 −2		source/platforms/sdl2/sdl2_audio.cpp
+25 −12		source/skeleton/audio.cpp
+13 −18		source/skeleton/renderer.cpp