RaySollium99/picodrive
1
0
Fork 0
mirror of https://github.com/RaySollium99/picodrive.git synced 2025-09-06 23:58:04 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

sound, add panning for ym2612 dac

Browse source
This commit is contained in:
kub 2024-07-08 22:41:01 +02:00
parent 4af69a1df0
commit 73411ac447
1 changed files with 22 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

31
pico/sound/sound.c
View file

@ -16,6 +16,8 @@
#include "resampler.h" #include "resampler.h"
#include "mix.h" #include "mix.h"
#define YM2612_CH6PAN 0x1b6 // panning register for channel 6 (used for DAC)
void (*PsndMix_32_to_16)(s16 *dest, s32 *src, int count) = mix_32_to_16_stereo; void (*PsndMix_32_to_16)(s16 *dest, s32 *src, int count) = mix_32_to_16_stereo;
// master int buffer to mix to // master int buffer to mix to
@ -282,9 +284,12 @@ PICO_INTERNAL void PsndDoDAC(int cyc_to)
// 1 sample delay for correct IIR filtering over audio frame boundaries // 1 sample delay for correct IIR filtering over audio frame boundaries
if (PicoIn.opt & POPT_EN_STEREO) { if (PicoIn.opt & POPT_EN_STEREO) {
s16 *d = PicoIn.sndOut + pos*2; s16 *d = PicoIn.sndOut + pos*2;
// left channel only, mixed ro right channel in mixing phase int pan = ym2612.REGS[YM2612_CH6PAN];
*d++ += Pico.snd.dac_val2, *d++ += Pico.snd.dac_val2; int l = pan & 0x80 ? Pico.snd.dac_val : 0;
while (--len) *d++ += Pico.snd.dac_val, *d++ += Pico.snd.dac_val; int r = pan & 0x40 ? Pico.snd.dac_val : 0;
*d++ += pan & 0x80 ? Pico.snd.dac_val2 : 0;
*d++ += pan & 0x40 ? Pico.snd.dac_val2 : 0;
while (--len) *d++ += l, *d++ += r;
} else { } else {
s16 *d = PicoIn.sndOut + pos; s16 *d = PicoIn.sndOut + pos;
*d++ += Pico.snd.dac_val2; *d++ += Pico.snd.dac_val2;
@ -516,13 +521,21 @@ static int PsndRender(int offset, int length)
// Fill up DAC output in case of missing samples (Q rounding errors) // Fill up DAC output in case of missing samples (Q rounding errors)
if (length-daclen > 0 && PicoIn.sndOut) { if (length-daclen > 0 && PicoIn.sndOut) {
s16 *dacbuf = PicoIn.sndOut + (daclen << stereo);
Pico.snd.dac_pos += (length-daclen) << 20; Pico.snd.dac_pos += (length-daclen) << 20;
*dacbuf++ += Pico.snd.dac_val2; if (PicoIn.opt & POPT_EN_STEREO) {
if (stereo) *dacbuf++ += Pico.snd.dac_val2; s16 *d = PicoIn.sndOut + daclen*2;
for (daclen++; length-daclen > 0; daclen++) { int pan = ym2612.REGS[YM2612_CH6PAN];
*dacbuf++ += Pico.snd.dac_val; int l = pan & 0x80 ? Pico.snd.dac_val : 0;
if (stereo) *dacbuf++ += Pico.snd.dac_val; int r = pan & 0x40 ? Pico.snd.dac_val : 0;
*d++ += pan & 0x80 ? Pico.snd.dac_val2 : 0;
*d++ += pan & 0x40 ? Pico.snd.dac_val2 : 0;
if (l|r) for (daclen++; length-daclen > 0; daclen++)
*d++ += l, *d++ += r;
} else {
s16 *d = PicoIn.sndOut + daclen;
*d++ += Pico.snd.dac_val2;
if (Pico.snd.dac_val) for (daclen++; length-daclen > 0; daclen++)
*d++ += Pico.snd.dac_val;
} }
Pico.snd.dac_val2 = Pico.snd.dac_val; Pico.snd.dac_val2 = Pico.snd.dac_val;
} }