Max
/
SameBoy
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Corrected the emulated DAC’s range

This commit is contained in:
Lior Halphon 2018-02-16 01:26:37 +02:00
parent 0c231db9e7
commit fc35111ae7
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Core/apu.c
View File

@ -21,7 +21,7 @@ static void refresh_channel(GB_gameboy_t *gb, unsigned index, unsigned cycles_of
gb->apu_output.last_update[index] = gb->apu_output.cycles_since_render + cycles_offset; gb->apu_output.last_update[index] = gb->apu_output.cycles_since_render + cycles_offset;
} }
static void update_sample(GB_gameboy_t *gb, unsigned index, uint8_t value, unsigned cycles_offset) static void update_sample(GB_gameboy_t *gb, unsigned index, int8_t value, unsigned cycles_offset)
{ {
gb->apu.samples[index] = value; gb->apu.samples[index] = value;
if (gb->apu.is_active[index] && gb->apu_output.sample_rate) { if (gb->apu.is_active[index] && gb->apu_output.sample_rate) {
@ -33,7 +33,7 @@ static void update_sample(GB_gameboy_t *gb, unsigned index, uint8_t value, unsig
if (gb->io_registers[GB_IO_NR51] & (0x10 << index)) { if (gb->io_registers[GB_IO_NR51] & (0x10 << index)) {
right_volume = ((gb->io_registers[GB_IO_NR50] >> 4) & 7) + 1; right_volume = ((gb->io_registers[GB_IO_NR50] >> 4) & 7) + 1;
} }
GB_sample_t output = {(0xf - value) * left_volume, (0xf - value) * right_volume}; GB_sample_t output = {(0xf - value * 2) * left_volume, (0xf - value * 2) * right_volume};
if (*(uint32_t *)&(gb->apu_output.current_sample[index]) != *(uint32_t *)&output) { if (*(uint32_t *)&(gb->apu_output.current_sample[index]) != *(uint32_t *)&output) {
refresh_channel(gb, index, cycles_offset); refresh_channel(gb, index, cycles_offset);
gb->apu_output.current_sample[index] = output; gb->apu_output.current_sample[index] = output;
@ -51,9 +51,9 @@ static void render(GB_gameboy_t *gb)
} }
else { else {
refresh_channel(gb, i, 0); refresh_channel(gb, i, 0);
output.left += (unsigned) gb->apu_output.summed_samples[i].left * CH_STEP output.left += (signed long) gb->apu_output.summed_samples[i].left * CH_STEP
/ gb->apu_output.cycles_since_render; / gb->apu_output.cycles_since_render;
output.right += (unsigned) gb->apu_output.summed_samples[i].right * CH_STEP output.right += (signed long) gb->apu_output.summed_samples[i].right * CH_STEP
/ gb->apu_output.cycles_since_render; / gb->apu_output.cycles_since_render;
gb->apu_output.summed_samples[i] = (GB_sample_t){0, 0}; gb->apu_output.summed_samples[i] = (GB_sample_t){0, 0};
} }

4
Core/apu.h
View File

@ -9,9 +9,9 @@
/* Divides nicely and never overflows with 4 channels and 8 (1-8) volume levels */ /* Divides nicely and never overflows with 4 channels and 8 (1-8) volume levels */
#ifdef WIIU #ifdef WIIU
/* Todo: Remove this hack once https://github.com/libretro/RetroArch/issues/6252 is fixed*/ /* Todo: Remove this hack once https://github.com/libretro/RetroArch/issues/6252 is fixed*/
#define MAX_CH_AMP (0x1FE0 / 4) #define MAX_CH_AMP (0xFF0 / 2)
#else #else
#define MAX_CH_AMP 0x1FE0 #define MAX_CH_AMP 0xFF0
#endif #endif
#define CH_STEP (MAX_CH_AMP/0xF/8) #define CH_STEP (MAX_CH_AMP/0xF/8)
#endif #endif