decoder/flac: try to recover from seek error()

libFLAC API documentation suggests that FLAC__stream_decoder_flush() should be called to recover from FLAC__STREAM_DECODER_SEEK_ERROR.

decoder/flac: try to recover from seek error()
f9130f42 · Max Kellermann · faf2eeaa · f9130f42
Commit f9130f42 authored Jul 05, 2016 by Max Kellermann
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 1 deletion

FlacDecoderPlugin.cxx src/decoder/plugins/FlacDecoderPlugin.cxx +9 -1

No files found.
--- a/src/decoder/plugins/FlacDecoderPlugin.cxx
+++ b/src/decoder/plugins/FlacDecoderPlugin.cxx
@@ -209,8 +209,16 @@ flac_decoder_loop(struct flac_data *data, FLAC__StreamDecoder *flac_dec,
 			/* regular end of stream */
 			return;

-		case FLAC__STREAM_DECODER_OGG_ERROR:
 		case FLAC__STREAM_DECODER_SEEK_ERROR:
+			/* try to recover from seek error */
+			if (!FLAC__stream_decoder_flush(flac_dec)) {
+				LogError(flac_domain, "FLAC__stream_decoder_flush() failed");
+				return;
+			}
+
+			break;
+
+		case FLAC__STREAM_DECODER_OGG_ERROR:
 		case FLAC__STREAM_DECODER_ABORTED:
 		case FLAC__STREAM_DECODER_MEMORY_ALLOCATION_ERROR:
 			/* an error, fatal enough for us to abort the