vorbis_encoder: reinitialize vorbis_dsp_state after flush

libvorbis goes into a very long loop if we try to add data after a
flush was invoked by vorbis_analysis_wrote(0).  This seems to be a
problem with the internal end-of-stream marker.  Thus, we cannot reuse
the vorbis_dsp_state object.

1 files changed, 7 insertions, 0 deletions

diff --git a/src/encoder/vorbis_encoder.c b/src/encoder/vorbis_encoder.c
index b2b71f335..2e54b18d3 100644
--- a/src/encoder/vorbis_encoder.c
+++ b/src/encoder/vorbis_encoder.c
@@ -262,6 +262,13 @@ vorbis_encoder_flush(struct encoder *_encoder, G_GNUC_UNUSED GError **error)
 	vorbis_analysis_wrote(&encoder->vd, 0);
 	vorbis_encoder_blockout(encoder);
 
+	/* reinitialize vorbis_dsp_state and vorbis_block to reset the
+	   end-of-stream marker */
+	vorbis_block_clear(&encoder->vb);
+	vorbis_dsp_clear(&encoder->vd);
+	vorbis_analysis_init(&encoder->vd, &encoder->vi);
+	vorbis_block_init(&encoder->vd, &encoder->vb);
+
 	encoder->flush = true;
 	return true;
 }