RIO-9162: Fix for proper handling of MP4 clips with invalid edit list…

… atoms Change-Id: I57fbab8e2751f8eb4cf627992e490c5f8b01a962
lhzhang · Jun 23, 2010 · d4da202 · d4da202
1 parent 2136fdd
commit d4da202
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 10 deletions.
diff --git a/engines/2way/src/pv_2way_sdkinfo.h b/engines/2way/src/pv_2way_sdkinfo.h
@@ -21,7 +21,7 @@
 // This header file is automatically generated at build-time
 // *** OFFICIAL RELEASE INFO -- Will not auto update
 
-#define PV2WAY_ENGINE_SDKINFO_LABEL "1503207"
-#define PV2WAY_ENGINE_SDKINFO_DATE 0x20100617
+#define PV2WAY_ENGINE_SDKINFO_LABEL "1503703"
+#define PV2WAY_ENGINE_SDKINFO_DATE 0x20100618
 
 #endif //PV_2WAY_SDKINFO_H_INCLUDED
diff --git a/engines/author/src/pv_author_sdkinfo.h b/engines/author/src/pv_author_sdkinfo.h
@@ -21,7 +21,7 @@
 // This header file is automatically generated at build-time
 // *** OFFICIAL RELEASE INFO -- Will not auto update
 
-#define PVAUTHOR_ENGINE_SDKINFO_LABEL "1503207"
-#define PVAUTHOR_ENGINE_SDKINFO_DATE 0x20100617
+#define PVAUTHOR_ENGINE_SDKINFO_LABEL "1503703"
+#define PVAUTHOR_ENGINE_SDKINFO_DATE 0x20100618
 
 #endif //PV_AUTHOR_SDKINFO_H_INCLUDED
diff --git a/engines/player/src/pv_player_sdkinfo.h b/engines/player/src/pv_player_sdkinfo.h
@@ -21,7 +21,7 @@
 // This header file is automatically generated at build-time
 // *** OFFICIAL RELEASE INFO -- Will not auto update
 
-#define PVPLAYER_ENGINE_SDKINFO_LABEL "1503207"
-#define PVPLAYER_ENGINE_SDKINFO_DATE 0x20100617
+#define PVPLAYER_ENGINE_SDKINFO_LABEL "1503703"
+#define PVPLAYER_ENGINE_SDKINFO_DATE 0x20100618
 
 #endif //PV_PLAYER_SDKINFO_H_INCLUDED
diff --git a/fileformats/mp4/parser/src/editatom.cpp b/fileformats/mp4/parser/src/editatom.cpp
@@ -61,9 +61,10 @@ EditAtom::EditAtom(MP4_FF_FILE *fp, uint32 size, uint32 type)
             }
             else
             {
-                _success = false;
-                _mp4ErrorCode = READ_UNKNOWN_ATOM;
-                break;
+                dataLength -= atomSize;
+                atomSize -= DEFAULT_ATOM_SIZE;
+                AtomUtils::seekFromCurrPos(fp, atomSize);
+
             }
 
         }

diff --git a/fileformats/mp4/parser/src/sampletableatom.cpp b/fileformats/mp4/parser/src/sampletableatom.cpp
@@ -3578,7 +3578,7 @@ void SampleTableAtom::handleEditList(uint64 &ts)
     if ((_pEditListTimeVec == NULL) || (_pEditListDurationVec == NULL))
         return;
 
-    if ((ts < _prevEditDuration) || (_editIndex > _pEditListTimeVec->size()))
+    if ((ts < _prevEditDuration) || (_editIndex >= _pEditListTimeVec->size()))
         return;
 
     if ((*_pEditListTimeVec)[_editIndex] == -1)