oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

decoder/mad: move duplicate code to RecoverFrameError()

Browse Source
This commit is contained in:
Max Kellermann 2014-08-26 10:51:47 +02:00
parent f10d9996d2
commit 9da88eec3e
1 changed files with 16 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/decoder/plugins/MadDecoderPlugin.cxx
View File

@ -410,6 +410,20 @@ id3_tag_query(const void *p0, size_t length)
} }
#endif /* !HAVE_ID3TAG */ #endif /* !HAVE_ID3TAG */
static enum mp3_action
RecoverFrameError(struct mad_stream &stream)
{
if (MAD_RECOVERABLE(stream.error))
return DECODE_SKIP;
else if (stream.error == MAD_ERROR_BUFLEN)
return DECODE_CONT;
FormatWarning(mad_domain,
"unrecoverable frame level error: %s",
mad_stream_errorstr(&stream));
return DECODE_BREAK;
}
enum mp3_action enum mp3_action
MadDecoder::DecodeNextFrameHeader(Tag **tag) MadDecoder::DecodeNextFrameHeader(Tag **tag)
{ {
@ -433,16 +447,7 @@ MadDecoder::DecodeNextFrameHeader(Tag **tag)
} }
} }
if (MAD_RECOVERABLE(stream.error)) return RecoverFrameError(stream);
return DECODE_SKIP;
else if (stream.error == MAD_ERROR_BUFLEN)
return DECODE_CONT;
else {
FormatWarning(mad_domain,
"unrecoverable frame level error: %s",
mad_stream_errorstr(&stream));
return DECODE_BREAK;
}
} }
enum mad_layer new_layer = frame.header.layer; enum mad_layer new_layer = frame.header.layer;
@ -479,16 +484,7 @@ MadDecoder::DecodeNextFrame()
} }
} }
if (MAD_RECOVERABLE(stream.error)) return RecoverFrameError(stream);
return DECODE_SKIP;
else if (stream.error == MAD_ERROR_BUFLEN)
return DECODE_CONT;
else {
FormatWarning(mad_domain,
"unrecoverable frame level error: %s",
mad_stream_errorstr(&stream));
return DECODE_BREAK;
}
} }
return DECODE_OK; return DECODE_OK;