stagefright-plugins: Seek to beginning of file on seek error

 * Prevent a deadlock on seek error

Change-Id: Ic7dfe1849298f6166154c319e618048720d1ea61

diff --git a/extractor/FFmpegExtractor.cpp b/extractor/FFmpegExtractor.cpp
index 04b5140..f966b4d 100644 (file)
--- a/extractor/FFmpegExtractor.cpp
+++ b/extractor/FFmpegExtractor.cpp
@@ -1147,15 +1147,15 @@ void FFmpegExtractor::readerEntry() {
             ret = avformat_seek_file(mFormatCtx, -1, mSeekMin, mSeekPos, mSeekMax, 0);
             if (ret < 0) {
                 ALOGE("%s: error while seeking", mFormatCtx->filename);
-            } else {
-                if (mAudioStreamIdx >= 0) {
-                    packet_queue_flush(&mAudioQ);
-                    packet_queue_put(&mAudioQ, &mAudioQ.flush_pkt);
-                }
-                if (mVideoStreamIdx >= 0) {
-                    packet_queue_flush(&mVideoQ);
-                    packet_queue_put(&mVideoQ, &mVideoQ.flush_pkt);
-                }
+                avformat_seek_file(mFormatCtx, -1, 0, 0, 0, 0);
+            }
+            if (mAudioStreamIdx >= 0) {
+                packet_queue_flush(&mAudioQ);
+                packet_queue_put(&mAudioQ, &mAudioQ.flush_pkt);
+            }
+            if (mVideoStreamIdx >= 0) {
+                packet_queue_flush(&mVideoQ);
+                packet_queue_put(&mVideoQ, &mVideoQ.flush_pkt);
             }
             mSeekIdx = -1;
             eof = false;