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

[MAD Decoder] Better handle VBRI header frame skip 

Skip the frame during decode, which will likely incur a BADDATAPTR error
on the first frame, as has already been logged in the development
process. Instead, skip the first frame, then proceed to the next one.

Signed-off-by: Christopher Snowhill <kode54@gmail.com>
swiftingly
Christopher Snowhill 2022-06-21 05:48:58 -07:00
parent 93ebedbcd9
commit 8b2ce33813
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Plugins/MAD/MADDecoder.m
View File

@ -566,8 +566,12 @@
// DLog(@"Read stream."); // DLog(@"Read stream.");
} }
BOOL skippingBadFrame = NO;
if(mad_frame_decode(&_frame, &_stream) == -1) { if(mad_frame_decode(&_frame, &_stream) == -1) {
if(MAD_RECOVERABLE(_stream.error)) { if(_stream.error == MAD_ERROR_BADDATAPTR) {
skippingBadFrame = YES;
} else if(MAD_RECOVERABLE(_stream.error)) {
const uint8_t *buffer = _stream.this_frame; const uint8_t *buffer = _stream.this_frame;
unsigned long buflen = _stream.bufend - _stream.this_frame; unsigned long buflen = _stream.bufend - _stream.this_frame;
uint32_t id3_length = 0; uint32_t id3_length = 0;
@ -597,7 +601,7 @@
} }
} }
if(!_firstFrame || !_foundXingHeader) { if(!_firstFrame || !(_foundXingHeader && _foundVBRIHeader)) {
signed long frameDuration = mad_timer_count(_frame.header.duration, sampleRate); signed long frameDuration = mad_timer_count(_frame.header.duration, sampleRate);
if((framesToSkip - 1152 * 4) >= frameDuration) { if((framesToSkip - 1152 * 4) >= frameDuration) {
framesToSkip -= frameDuration; framesToSkip -= frameDuration;
@ -607,7 +611,9 @@
} }
// DLog(@"Decoded buffer."); // DLog(@"Decoded buffer.");
if(!skippingBadFrame) {
mad_synth_frame(&_synth, &_frame); mad_synth_frame(&_synth, &_frame);
}
// DLog(@"first frame: %i", _firstFrame); // DLog(@"first frame: %i", _firstFrame);
if(_firstFrame) { if(_firstFrame) {
_firstFrame = NO; _firstFrame = NO;
@ -638,6 +644,8 @@
// DLog(@"Skipping xing header."); // DLog(@"Skipping xing header.");
return 0; return 0;
} }
} else if(skippingBadFrame) {
return 0;
} }
return 1; return 1;