diff options
| author | PacketVideo CM <engbuild@pv.com> | 2010-06-23 14:06:51 -0700 |
|---|---|---|
| committer | PacketVideo CM <engbuild@pv.com> | 2010-06-23 14:31:04 -0700 |
| commit | 2b7f42f492d8513bf06d80cf99cf7568d0fa7d44 (patch) | |
| tree | 4348f19ea62a91ee876c12c2b02559defdc2daf1 | |
| parent | 0854a58230a8aae0071ffb9ac5d566e6b3dcb6fd (diff) | |
| download | opencore-2b7f42f492d8513bf06d80cf99cf7568d0fa7d44.tar.gz | |
RIO-9299: Incorrect handling of INSUFFICIENT_DATA error when parsing mp4 movie fragment clip
Change-Id: I90328c46b61af16536b98d9a9f9a8da7d9473206
| -rw-r--r-- | engines/2way/src/pv_2way_sdkinfo.h | 4 | ||||
| -rw-r--r-- | engines/author/src/pv_author_sdkinfo.h | 4 | ||||
| -rw-r--r-- | engines/player/src/pv_player_sdkinfo.h | 4 | ||||
| -rw-r--r-- | fileformats/mp4/parser/src/mpeg4file.cpp | 17 |
4 files changed, 7 insertions, 22 deletions
diff --git a/engines/2way/src/pv_2way_sdkinfo.h b/engines/2way/src/pv_2way_sdkinfo.h index 9ffec7d99..0c0f78238 100644 --- 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 "1500649" -#define PV2WAY_ENGINE_SDKINFO_DATE 0x20100616 +#define PV2WAY_ENGINE_SDKINFO_LABEL "1502033" +#define PV2WAY_ENGINE_SDKINFO_DATE 0x20100617 #endif //PV_2WAY_SDKINFO_H_INCLUDED diff --git a/engines/author/src/pv_author_sdkinfo.h b/engines/author/src/pv_author_sdkinfo.h index fbf8cd47d..4bdb707d5 100644 --- 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 "1500649" -#define PVAUTHOR_ENGINE_SDKINFO_DATE 0x20100616 +#define PVAUTHOR_ENGINE_SDKINFO_LABEL "1502033" +#define PVAUTHOR_ENGINE_SDKINFO_DATE 0x20100617 #endif //PV_AUTHOR_SDKINFO_H_INCLUDED diff --git a/engines/player/src/pv_player_sdkinfo.h b/engines/player/src/pv_player_sdkinfo.h index e5aebd1c2..63828baa3 100644 --- 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 "1500649" -#define PVPLAYER_ENGINE_SDKINFO_DATE 0x20100616 +#define PVPLAYER_ENGINE_SDKINFO_LABEL "1502033" +#define PVPLAYER_ENGINE_SDKINFO_DATE 0x20100617 #endif //PV_PLAYER_SDKINFO_H_INCLUDED diff --git a/fileformats/mp4/parser/src/mpeg4file.cpp b/fileformats/mp4/parser/src/mpeg4file.cpp index de3cadb6d..5d66457ca 100644 --- a/fileformats/mp4/parser/src/mpeg4file.cpp +++ b/fileformats/mp4/parser/src/mpeg4file.cpp @@ -2421,22 +2421,7 @@ int32 Mpeg4File::getNextBundledAccessUnits(const uint32 trackID, if (return1 == END_OF_TRACK) { *n = totalSampleRead; - if (!MoreMoofAtomsExpected(_movieFragmentSeqIdx[moofIdx])) - { - _movieFragmentIdx[moofIdx] = 0; - } - else - { - //We have run out of moofs and theres no data to be parsed - if (totalSampleRead == 0) - { - return1 = INSUFFICIENT_DATA; - } - else - { - return1 = EVERYTHING_FINE; - } - } + _movieFragmentIdx[moofIdx] = 0; return return1; } } |