ShuriZma
/
BizHawk
mirror of https://github.com/TASEmulators/BizHawk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Intellivision more sound work 

Emualtion should be correct now, but it sounds off for the first 1 second after the emualtor starts, or when you pause and unpause it.
Also sounds awful when recording a movie.
Not sure what is happeneing.
This commit is contained in:
alyosha-tas 2017-02-07 19:59:59 -05:00 committed by GitHub
parent 5277be6833
commit 65c5cdc3f5
1 changed files with 22 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
BizHawk.Emulation.Cores/Consoles/Intellivision/PSG.cs
View File

@ -13,9 +13,10 @@ namespace BizHawk.Emulation.Cores.Intellivision
public void Reset() public void Reset()
{ {
sq_per_A = sq_per_B = sq_per_C = clock_A = clock_B = clock_C = 0x1000; sq_per_A = sq_per_B = sq_per_C = clock_A = clock_B = clock_C = 0x1;
noise_per = noise_clock = 64; noise_per = noise_clock = 64;
env_per = 0x20000; env_per = 0x1;
DiscardSamples();
} }
public void DiscardSamples() public void DiscardSamples()
@ -54,18 +55,17 @@ namespace BizHawk.Emulation.Cores.Intellivision
public void GetSamplesSync(out short[] samples, out int nsamp) public void GetSamplesSync(out short[] samples, out int nsamp)
{ {
short[] ret = new short[932 * 2]; short[] ret = new short[(sample_count) * 2];
GetSamples(ret); GetSamples(ret);
samples = ret; samples = ret;
nsamp = 932; nsamp = (sample_count);
} }
public void GetSamples(short[] samples) public void GetSamples(short[] samples)
{ {
for (int i = 0; i < samples.Length / 2; i++) for (int i = 0; i < samples.Length / 2; i++)
{ {
//samples[i * 2] = (short)(audio_samples[(int)Math.Floor(3.7904 * i)]); samples[i * 2] = (short)(audio_samples[i]);
samples[i * 2] = (short)(audio_samples[(4 * i)]);
samples[(i * 2) + 1] = samples[i * 2]; samples[(i * 2) + 1] = samples[i * 2];
} }
} }
@ -145,26 +145,26 @@ namespace BizHawk.Emulation.Cores.Intellivision
sq_per_A = (Register[0] & 0xFF) | (((Register[4] & 0xF) << 8)); sq_per_A = (Register[0] & 0xFF) | (((Register[4] & 0xF) << 8));
if (sq_per_A == 0) if (sq_per_A == 0)
sq_per_A = 0x1000; sq_per_A = 0x1;
sq_per_B = (Register[1] & 0xFF) | (((Register[5] & 0xF) << 8)); sq_per_B = (Register[1] & 0xFF) | (((Register[5] & 0xF) << 8));
if (sq_per_B == 0) if (sq_per_B == 0)
sq_per_B = 0x1000; sq_per_B = 0x1;
sq_per_C = (Register[2] & 0xFF) | (((Register[6] & 0xF) << 8)); sq_per_C = (Register[2] & 0xFF) | (((Register[6] & 0xF) << 8));
if (sq_per_C == 0) if (sq_per_C == 0)
sq_per_C = 0x1000; sq_per_C = 0x1;
env_per = (Register[3] & 0xFF) | (((Register[7] & 0xFF) << 8)); env_per = (Register[3] & 0xFF) | (((Register[7] & 0xFF) << 8));
if (env_per == 0) if (env_per == 0)
env_per = 0x20000; env_per = 0x1;
A_on = Register[8].Bit(0); A_on = !Register[8].Bit(0);
B_on = Register[8].Bit(1); B_on = !Register[8].Bit(1);
C_on = Register[8].Bit(2); C_on = !Register[8].Bit(2);
A_noise = Register[8].Bit(3); A_noise = !Register[8].Bit(3);
B_noise = Register[8].Bit(4); B_noise = !Register[8].Bit(4);
C_noise = Register[8].Bit(5); C_noise = !Register[8].Bit(5);
noise_per = Register[9] & 0x1F; noise_per = Register[9] & 0x1F;
if (noise_per == 0) if (noise_per == 0)
@ -325,9 +325,9 @@ namespace BizHawk.Emulation.Cores.Intellivision
clock_C = sq_per_C; clock_C = sq_per_C;
} }
sound_out_A = (noise.Bit(0) | A_noise) & (A_on | A_up); sound_out_A = (noise.Bit(0) & A_noise) | (A_on & A_up);
sound_out_B = (noise.Bit(0) | B_noise) & (B_on | B_up); sound_out_B = (noise.Bit(0) & B_noise) | (B_on & B_up);
sound_out_C = (noise.Bit(0) | C_noise) & (C_on | C_up); sound_out_C = (noise.Bit(0) & C_noise) | (C_on & C_up);
//now calculate the volume of each channel and add them together //now calculate the volume of each channel and add them together
if (env_vol_A == 0) if (env_vol_A == 0)
@ -340,6 +340,7 @@ namespace BizHawk.Emulation.Cores.Intellivision
if (shift_A < 0) if (shift_A < 0)
shift_A = 0; shift_A = 0;
audio_samples[sample_count] = (short)(sound_out_A ? (volume_table[env_E]>>shift_A) : 0); audio_samples[sample_count] = (short)(sound_out_A ? (volume_table[env_E]>>shift_A) : 0);
//Console.WriteLine("using env volume");
} }
if (env_vol_B == 0) if (env_vol_B == 0)
@ -352,6 +353,7 @@ namespace BizHawk.Emulation.Cores.Intellivision
if (shift_B < 0) if (shift_B < 0)
shift_B = 0; shift_B = 0;
audio_samples[sample_count] += (short)(sound_out_B ? (volume_table[env_E] >> shift_B) : 0); audio_samples[sample_count] += (short)(sound_out_B ? (volume_table[env_E] >> shift_B) : 0);
//Console.WriteLine("using env volume");
} }
if (env_vol_C == 0) if (env_vol_C == 0)
@ -364,6 +366,7 @@ namespace BizHawk.Emulation.Cores.Intellivision
if (shift_C < 0) if (shift_C < 0)
shift_C = 0; shift_C = 0;
audio_samples[sample_count] += (short)(sound_out_C ? (volume_table[env_E] >> shift_C) : 0); audio_samples[sample_count] += (short)(sound_out_C ? (volume_table[env_E] >> shift_C) : 0);
//Console.WriteLine("using env volume");
} }
sample_count++; sample_count++;
} }