[audioCore] try to ignore packets that are out of range Dts wise

mean00 · Aug 31, 2016 · 5de3ef9 · 5de3ef9
1 parent e8f015d
commit 5de3ef9
Showing 1 changed file with 18 additions and 1 deletion.
diff --git a/avidemux_core/ADM_coreAudio/src/ADM_audioStreamBuffered.cpp b/avidemux_core/ADM_coreAudio/src/ADM_audioStreamBuffered.cpp
@@ -28,6 +28,9 @@ ADM_audioStreamBuffered::ADM_audioStreamBuffered(WAVHeader *header,ADM_audioAcce
 */
 bool ADM_audioStreamBuffered::refill(void)
 {
+        int nbTry=0;
+#define MAX_TRIES 50 // ~ 1 sec
+again:
         // Shrink buffer...
         if(limit>ADM_AUDIOSTREAM_BUFFER_SIZE && start> 10*1024)
         {
@@ -48,7 +51,21 @@ bool ADM_audioStreamBuffered::refill(void)
         {
             if( labs((int64_t)newDts-(int64_t)lastDts)>ADM_MAX_SKEW)
             {
-                printf("[AudioStream] Warning skew in dts =%" PRId64", \n",(int64_t)newDts-(uint64_t)lastDts);
+                if(newDts<lastDts || newDts>(lastDts+60LL*1000000LL)) // If the jump is absurd we ignore it
+                {
+                        nbTry++;
+                        if(nbTry<MAX_TRIES)
+                        {
+                            ADM_warning("Trying to ignore the discontinuous timestamp (%d try)\n",nbTry);
+                            goto again;
+                        }
+                }
+                uint64_t delta=labs((int64_t)newDts-(int64_t)lastDts);
+                const char *sign="+";
+                if(newDts<lastDts) sign="-";
+                printf("[AudioStream] Old dts=%s\n",ADM_us2plain(lastDts));
+                printf("[AudioStream] New dts=%s\n",ADM_us2plain(newDts));
+                printf("[AudioStream] Warning skew in dts =%s %lu \n",sign,delta);
                 printf("[AudioStream] Warning skew lastDts=%s \n",ADM_us2plain(lastDts));
                 printf("[AudioStream] Warning skew newDts=%s  \n",ADM_us2plain(newDts));
                 setDts(newDts);