check AVFormatContext before read. exit extract thread before close

pingsongsong · Oct 28, 2014 · 6692def · 6692def
1 parent 1ec7737
commit 6692def
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/src/AVDemuxer.cpp b/src/AVDemuxer.cpp
@@ -207,6  207,9 @@ MediaStatus AVDemuxer::mediaStatus() const
 
 bool AVDemuxer::readFrame()
 {
     if (!format_context)
         return false;
 
     QMutexLocker lock(&mutex);
     Q_UNUSED(lock);
     AVPacket packet;

diff --git a/src/VideoFrameExtractor.cpp b/src/VideoFrameExtractor.cpp
@@ -26,6  26,11 @@ class ExtractThread : public QThread {
         tasks.setCapacity(1); // avoid too frequent
     }
     ~ExtractThread() {
         waitStop();
     }
     void waitStop() {
         if (!isRunning())
             return;
         scheduleStop();
         wait();
     }
@@ -99,6  104,8 @@ class VideoFrameExtractorPrivate : public DPtrPrivate<VideoFrameExtractor>
                     << "FFmpeg";
     }
     ~VideoFrameExtractorPrivate() {
         // stop first before demuxer close to avoid running new seek task after demuxer is closed.
         thread.waitStop();
         demuxer.close();
     }