Skip to content

M
mpd
Commit 8a432c9b authored by Max Kellermann's avatar Max Kellermann
Browse files
Options

decoder/mad: move code to LoadNextFrame()

parent 187204f0
Show whitespace changes
Inline Side-by-side
Showing with 10 additions and 4 deletions
src/decoder/plugins/MadDecoderPlugin.cxx
View file @ 8a432c9b
...@@ -207,6 +207,8 @@ private: ...@@ -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 ...@@ -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 ...@@ -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
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment