decoder/mad: move code to LoadNextFrame()

This commit is contained in:
Max Kellermann 2019-08-03 11:19:19 +02:00
parent 187204f03c
commit 8a432c9b7f

View File

@ -207,6 +207,8 @@ private:
*/ */
bool HandleCurrentFrame() noexcept; bool HandleCurrentFrame() noexcept;
bool LoadNextFrame() noexcept;
bool Read() noexcept; bool Read() noexcept;
}; };
@ -965,11 +967,8 @@ MadDecoder::HandleCurrentFrame() noexcept
} }
inline bool inline bool
MadDecoder::Read() noexcept MadDecoder::LoadNextFrame() noexcept
{ {
if (!HandleCurrentFrame())
return false;
while (true) { while (true) {
MadDecoderAction ret; MadDecoderAction ret;
do { do {
@ -999,6 +998,13 @@ MadDecoder::Read() noexcept
} }
} }
inline bool
MadDecoder::Read() noexcept
{
return HandleCurrentFrame() &&
LoadNextFrame();
}
inline void inline void
MadDecoder::RunDecoder() noexcept MadDecoder::RunDecoder() noexcept
{ {