encoder/opus: call ogg_stream_flush() only in the last iteration

If there are multiple pages, the last partial page must be flushed.

encoder/opus: call ogg_stream_flush() only in the last iteration
31e1be75 · Max Kellermann · d793b7c0 · 31e1be75
Commit 31e1be75 authored Oct 02, 2012 by Max Kellermann
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 4 deletions

OpusEncoderPlugin.cxx src/encoder/OpusEncoderPlugin.cxx +4 -4

No files found.
--- a/src/encoder/OpusEncoderPlugin.cxx
+++ b/src/encoder/OpusEncoderPlugin.cxx
@@ -371,12 +371,12 @@ opus_encoder_read(struct encoder *_encoder, void *_dest, size_t length)
 		opus_encoder_generate_tags(encoder);

 	ogg_page page;
-	int result;
-	if (encoder->flush) {
+	int result = ogg_stream_pageout(&encoder->os, &page);
+	if (result == 0 && encoder->flush) {
 		encoder->flush = false;
 		result = ogg_stream_flush(&encoder->os, &page);
-	} else
-		result = ogg_stream_pageout(&encoder->os, &page);
+
+	}

 	if (result == 0)
 		return 0;