decoder/mad: move code to HandleCurrentFrame()

This commit is contained in:
Max Kellermann 2019-08-03 08:51:15 +02:00
parent 5e5fadb5f2
commit 187204f03c

View File

@ -202,6 +202,11 @@ private:
*/ */
DecoderCommand SyncAndSend() noexcept; DecoderCommand SyncAndSend() noexcept;
/**
* @return false to stop decoding
*/
bool HandleCurrentFrame() noexcept;
bool Read() noexcept; bool Read() noexcept;
}; };
@ -919,7 +924,7 @@ MadDecoder::SyncAndSend() noexcept
} }
inline bool inline bool
MadDecoder::Read() noexcept MadDecoder::HandleCurrentFrame() noexcept
{ {
switch (mute_frame) { switch (mute_frame) {
DecoderCommand cmd; DecoderCommand cmd;
@ -956,6 +961,15 @@ MadDecoder::Read() noexcept
return false; return false;
} }
return true;
}
inline bool
MadDecoder::Read() noexcept
{
if (!HandleCurrentFrame())
return false;
while (true) { while (true) {
MadDecoderAction ret; MadDecoderAction ret;
do { do {