[Mp4/demux] Workaround duplicated pts in some mp4, it is not a fix, i…

…t just prevents avidemux from crashing
mean00 · Jan 31, 2015 · bece91a · bece91a
1 parent d73b1a8
commit bece91a
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 0 deletions.
diff --git a/avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4.cpp b/avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4.cpp
@@ -513,8 +513,33 @@ uint8_t    MP4Header::open(const char *name)
         ADM_info("Last video PTS : %s\n",ADM_us2plain(_tracks[0].index[nb-1].pts));
         ADM_info("Last video DTS : %s\n",ADM_us2plain(_tracks[0].index[nb-1].dts));
 
+        checkDuplicatedPts();
+
         return 1;
 }
+bool MP4Header::checkDuplicatedPts(void)
+{
+        int nb=(int)_tracks[0].nbIndex;
+        for(int i=0;i<nb;i++)
+        {
+            int mn,mx;
+            mn=i-10;
+            if(mn<0) mn=0;
+            mx=i+10;
+            if(mx>=nb-1) mx=nb-1;
+            for(int j=mn;j<mx;j++)
+            {
+                if(j==i) continue;
+                if(_tracks[0].index[i].pts==_tracks[0].index[j].pts)
+                {
+                    ADM_warning("Duplicate pts %s at %d and %d\n",ADM_us2plain(_tracks[0].index[i].pts),i,j);
+                    _tracks[0].index[j].pts+=1000; // add 1 ms
+                }
+            }
+
+        }
+        return true;
+}
 /**
  * \fn adjustElstDelay
  * @return 

diff --git a/avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4.h b/avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4.h
@@ -155,6 +155,7 @@ class MP4Header         :public vidHeader
         bool                          refineAudio(WAVHeader *head,uint32_t extraLen, uint8_t *extra);
         bool                          shiftTimeBy(uint64_t shift);
         bool                          shiftAudioTimeBy(uint64_t shift);
+        bool                          checkDuplicatedPts(void);
          /*********************************/
 	uint32_t                         readPackedLen(adm_atom *tom );