ffmpegdecoder: allow probe duration pickup to be cancelled

2020-02-20 23:54:40 +11:00
parent bc2be7a2a4
commit 162c91ec52
1 changed files with 8 additions and 2 deletions
@@ -615,6 +615,10 @@ bool FFmpegDecoder::Probe(Footage *f, const QAtomicInt* cancelled)
    durations.fill(0);

    while (true) {
+      if (cancelled && *cancelled) {
+        break;
+      }
+
      // Ensure previous buffers are cleared
      av_packet_unref(pkt);

@@ -639,8 +643,10 @@ bool FFmpegDecoder::Probe(Footage *f, const QAtomicInt* cancelled)

    av_packet_free(&pkt);

-    for (int i=0;i<streams_that_need_manual_duration.size();i++) {
-      streams_that_need_manual_duration.at(i)->set_duration(durations.at(i));
+    if (!cancelled || !*cancelled) {
+      for (int i=0;i<streams_that_need_manual_duration.size();i++) {
+        streams_that_need_manual_duration.at(i)->set_duration(durations.at(i));
+      }
    }

  }