decoder/Opus: use OggExpectPage() in main loop

a6301d45 · Max Kellermann · b83d0692 · a6301d45
Commit a6301d45 authored Jan 08, 2013 by Max Kellermann
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 7 deletions

OpusDecoderPlugin.cxx src/decoder/OpusDecoderPlugin.cxx +5 -7

No files found.
--- a/src/decoder/OpusDecoderPlugin.cxx
+++ b/src/decoder/OpusDecoderPlugin.cxx
@@ -250,15 +250,13 @@ mpd_opus_stream_decode(struct decoder *decoder,
 	ogg_sync_init(&oy);
 	while (true) {
-		if (!OggFeed(oy, decoder, input_stream, 1024))
+		ogg_page page;
+		if (!OggExpectPage(oy, page, decoder, input_stream))
 			break;
-		ogg_page page;
+		enum decoder_command cmd = d.HandlePage(page);
-		while (ogg_sync_pageout(&oy, &page) == 1) {
+		if (cmd != DECODE_COMMAND_NONE)
-			enum decoder_command cmd = d.HandlePage(page);
+			break;
-			if (cmd != DECODE_COMMAND_NONE)
-				break;
-		}
 	}
 	ogg_sync_clear(&oy);