diff options
| author | Andreas Huber <andih@google.com> | 2010-02-23 10:12:02 -0800 |
|---|---|---|
| committer | Andreas Huber <andih@google.com> | 2010-02-23 10:21:39 -0800 |
| commit | bd5d93f21e6f79c6d9ebe9d77542c3090d4a7ff4 (patch) | |
| tree | 0f5e49301e3f5b9ecd2a9f1b117435ca966f6899 /media/libstagefright/include/MPEG4Extractor.h | |
| parent | 36efe505b61cf9d5d019f2021450401bde5d9858 (diff) | |
| download | frameworks_av-bd5d93f21e6f79c6d9ebe9d77542c3090d4a7ff4.zip frameworks_av-bd5d93f21e6f79c6d9ebe9d77542c3090d4a7ff4.tar.gz frameworks_av-bd5d93f21e6f79c6d9ebe9d77542c3090d4a7ff4.tar.bz2 | |
Return runtime errors instead of asserting in MPEG4 file format validation, also add more validation to ensure presence of codec specific data for avc, aac and mpeg4.
related-to-bug: 2431967
Diffstat (limited to 'media/libstagefright/include/MPEG4Extractor.h')
| -rw-r--r-- | media/libstagefright/include/MPEG4Extractor.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/media/libstagefright/include/MPEG4Extractor.h b/media/libstagefright/include/MPEG4Extractor.h index 3a63e88..9d35e0c 100644 --- a/media/libstagefright/include/MPEG4Extractor.h +++ b/media/libstagefright/include/MPEG4Extractor.h @@ -68,6 +68,8 @@ private: status_t updateAudioTrackInfoFromESDS_MPEG4Audio( const void *esds_data, size_t esds_size); + static status_t verifyTrack(Track *track); + MPEG4Extractor(const MPEG4Extractor &); MPEG4Extractor &operator=(const MPEG4Extractor &); }; |