a_dinosaur/ZSNES
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Wav writing can now do Mono!

Browse Source
This commit is contained in:
n-a-c-h
2006-03-20 13:51:01 +00:00
parent 21dc4f654d
commit b1b87f94b7
1 changed files with 22 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
zsnes/src/zmovie.c
View File

@@ -1872,6 +1872,7 @@ Code for dumping raw video
static const unsigned int freqtab[] = { 8000, 11025, 22050, 44100, 16000, 32000, 48000 }; static const unsigned int freqtab[] = { 8000, 11025, 22050, 44100, 16000, 32000, 48000 };
extern unsigned int SoundQuality; extern unsigned int SoundQuality;
extern unsigned char StereoSound;
#define RATE freqtab[SoundQuality] #define RATE freqtab[SoundQuality]
@@ -2071,10 +2072,10 @@ static bool raw_video_open()
fputs("WAVEfmt ", raw_vid.ap); //format fputs("WAVEfmt ", raw_vid.ap); //format
fwrite4(0x12, raw_vid.ap); //fmt size fwrite4(0x12, raw_vid.ap); //fmt size
fwrite2(1, raw_vid.ap); //fmt type (PCM) fwrite2(1, raw_vid.ap); //fmt type (PCM)
fwrite2(2, raw_vid.ap); //channels fwrite2(StereoSound+1, raw_vid.ap); //channels
fwrite4(RATE, raw_vid.ap); //sample rate fwrite4(RATE, raw_vid.ap); //sample rate
fwrite4(RATE*4, raw_vid.ap); //byte rate (sample rate*block align) fwrite4(RATE*4, raw_vid.ap); //byte rate (sample rate*block align)
fwrite2(16/8*2, raw_vid.ap); //block align (SignificantBitsPerSample / 8 * NumChannels) fwrite2(16/8*StereoSound, raw_vid.ap); //block align (SignificantBitsPerSample / 8 * NumChannels)
fwrite2(16, raw_vid.ap); //Significant bits per sample fwrite2(16, raw_vid.ap); //Significant bits per sample
fwrite2(0, raw_vid.ap); //Extra format bytes fwrite2(0, raw_vid.ap); //Extra format bytes
fputs("data", raw_vid.ap); //data header fputs("data", raw_vid.ap); //data header
@@ -2146,18 +2147,31 @@ static void raw_video_write_frame()
unsigned int samples; unsigned int samples;
if (romispal) if (romispal)
{ {
samples = RATE*2/50; if (StereoSound)
if (samples & 1)
{ {
static signed char odd_carry = 0; samples = RATE*2/50;
samples += odd_carry-1; if (samples & 1)
odd_carry ^= 2; {
static signed char odd_carry = 0;
samples += odd_carry-1;
odd_carry ^= 2;
}
}
else
{
samples = RATE/50;
if (freqtab[SoundQuality] & 1)
{
static signed char odd_carry = 0;
samples += odd_carry-1;
odd_carry ^= 2;
}
} }
} }
else else
{ {
//Thanks Bisqwit for this algorithm //Thanks Bisqwit for this algorithm
samples = (unsigned int)((raw_vid.sample_ntsc_balance/raw_vid.sample_ntsc_lo) << 1); samples = (unsigned int)((raw_vid.sample_ntsc_balance/raw_vid.sample_ntsc_lo) << StereoSound);
raw_vid.sample_ntsc_balance %= raw_vid.sample_ntsc_lo; raw_vid.sample_ntsc_balance %= raw_vid.sample_ntsc_lo;
raw_vid.sample_ntsc_balance += raw_vid.sample_ntsc_hi; raw_vid.sample_ntsc_balance += raw_vid.sample_ntsc_hi;
//printf("Frame %u: %u samples\n", raw_vid.sample_index, BufferSizeB); //printf("Frame %u: %u samples\n", raw_vid.sample_index, BufferSizeB);