diff options
| author | Robert Shih <robertshih@google.com> | 2014-05-09 19:08:24 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-05-09 19:08:24 +0000 |
| commit | 01427884471391999393a15abbb95b5f0dce7d3b (patch) | |
| tree | fa913a5d908956170d4ed81c821352d45093e9bd /media/libstagefright/include | |
| parent | 70c2fd3dc648b512ea088ee9de5e505c626fd39c (diff) | |
| parent | 170056540e9ce65261b45efd15f67e72e2df1bed (diff) | |
| download | frameworks_av-01427884471391999393a15abbb95b5f0dce7d3b.zip frameworks_av-01427884471391999393a15abbb95b5f0dce7d3b.tar.gz frameworks_av-01427884471391999393a15abbb95b5f0dce7d3b.tar.bz2 | |
Merge "Expose sample duration in MPEG4Extractor."
Diffstat (limited to 'media/libstagefright/include')
| -rw-r--r-- | media/libstagefright/include/SampleIterator.h | 4 | ||||
| -rw-r--r-- | media/libstagefright/include/SampleTable.h | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/media/libstagefright/include/SampleIterator.h b/media/libstagefright/include/SampleIterator.h index b5a043c..60c9e7e 100644 --- a/media/libstagefright/include/SampleIterator.h +++ b/media/libstagefright/include/SampleIterator.h @@ -30,6 +30,7 @@ struct SampleIterator { off64_t getSampleOffset() const { return mCurrentSampleOffset; } size_t getSampleSize() const { return mCurrentSampleSize; } uint32_t getSampleTime() const { return mCurrentSampleTime; } + uint32_t getSampleDuration() const { return mCurrentSampleDuration; } status_t getSampleSizeDirect( uint32_t sampleIndex, size_t *size); @@ -61,11 +62,12 @@ private: off64_t mCurrentSampleOffset; size_t mCurrentSampleSize; uint32_t mCurrentSampleTime; + uint32_t mCurrentSampleDuration; void reset(); status_t findChunkRange(uint32_t sampleIndex); status_t getChunkOffset(uint32_t chunk, off64_t *offset); - status_t findSampleTime(uint32_t sampleIndex, uint32_t *time); + status_t findSampleTimeAndDuration(uint32_t sampleIndex, uint32_t *time, uint32_t *duration); SampleIterator(const SampleIterator &); SampleIterator &operator=(const SampleIterator &); diff --git a/media/libstagefright/include/SampleTable.h b/media/libstagefright/include/SampleTable.h index 847dff7..fe146f2 100644 --- a/media/libstagefright/include/SampleTable.h +++ b/media/libstagefright/include/SampleTable.h @@ -66,7 +66,8 @@ public: off64_t *offset, size_t *size, uint32_t *compositionTime, - bool *isSyncSample = NULL); + bool *isSyncSample = NULL, + uint32_t *sampleDuration = NULL); enum { kFlagBefore, |