kode54
/
cog
2
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Rearranged comparison to prevent underflow.

CQTexperiment
vspader 2009-02-26 21:31:20 -08:00
parent d8df7afcbb
commit 876efcde38
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Plugins/MAD/MADDecoder.m
View File

@ -355,29 +355,29 @@ audio_linear_round(unsigned int bits,
unsigned int startingSample = 0; unsigned int startingSample = 0;
unsigned int sampleCount = _synth.pcm.length; unsigned int sampleCount = _synth.pcm.length;
//NSLog(@"Position: %li/%li", _framesDecoded, totalFrames); // NSLog(@"Position: %li/%li", _framesDecoded, totalFrames);
//NSLog(@"<%i, %i>", _startPadding, _endPadding); // NSLog(@"<%i, %i>", _startPadding, _endPadding);
//NSLog(@"Counts: %i, %i", startingSample, sampleCount); // NSLog(@"Counts: %i, %i", startingSample, sampleCount);
if (_foundLAMEHeader) { if (_foundLAMEHeader) {
if (_framesDecoded < _startPadding) { if (_framesDecoded < _startPadding) {
//NSLog(@"Skipping start."); // NSLog(@"Skipping start.");
startingSample = _startPadding - _framesDecoded; startingSample = _startPadding - _framesDecoded;
} }
if (_framesDecoded > totalFrames - _endPadding + startingSample) { if (_framesDecoded > totalFrames - _endPadding + startingSample) {
//NSLog(@"End of file. Not writing."); // NSLog(@"End of file. Not writing.");
return; return;
} }
if (_framesDecoded + (sampleCount - startingSample) > totalFrames - _endPadding) { if (_framesDecoded + sampleCount + _endPadding > totalFrames + startingSample ) {
sampleCount = totalFrames - _endPadding - _framesDecoded + startingSample; // NSLog(@"End of file. %li", totalFrames - _endPadding - _framesDecoded);
//NSLog(@"End of file. %li", totalFrames - _endPadding - _framesDecoded); sampleCount = totalFrames + startingSample - _endPadding - _framesDecoded;
} }
if (startingSample > sampleCount) { if (startingSample > sampleCount) {
// NSLog(@"Skipping entire sample");
_framesDecoded += _synth.pcm.length; _framesDecoded += _synth.pcm.length;
//NSLog(@"Skipping entire sample");
return; return;
} }