diff options
| author | Lajos Molnar <lajos@google.com> | 2014-07-17 10:52:36 -0700 |
|---|---|---|
| committer | Lajos Molnar <lajos@google.com> | 2014-07-22 11:55:19 -0700 |
| commit | c75fa318ee6a775c6201424e952561e6b9d695e2 (patch) | |
| tree | 63c3dda569781e3a04dac92ef133dda6d7050f6c /media/libstagefright/MPEG4Extractor.cpp | |
| parent | 2e25819fffbb23d42541ead1bf735f3a02fa0330 (diff) | |
| download | frameworks_av-c75fa318ee6a775c6201424e952561e6b9d695e2.zip frameworks_av-c75fa318ee6a775c6201424e952561e6b9d695e2.tar.gz frameworks_av-c75fa318ee6a775c6201424e952561e6b9d695e2.tar.bz2 | |
stagefright: Fix seeking in MPEG4 container - do not merge
- seek based on user-visible timestamp
- seek to previous, next and closest exactly
- also update OggExtractor seek to same logic
Bug: 12786906
Change-Id: I2d5e1fbff6469b6f081a284be2222a4cb50aa754
Diffstat (limited to 'media/libstagefright/MPEG4Extractor.cpp')
| -rw-r--r-- | media/libstagefright/MPEG4Extractor.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/media/libstagefright/MPEG4Extractor.cpp b/media/libstagefright/MPEG4Extractor.cpp index 362cd6b..7d3a838 100644 --- a/media/libstagefright/MPEG4Extractor.cpp +++ b/media/libstagefright/MPEG4Extractor.cpp @@ -3284,7 +3284,7 @@ status_t MPEG4Source::read( uint32_t sampleIndex; status_t err = mSampleTable->findSampleAtTime( - seekTimeUs * mTimescale / 1000000, + seekTimeUs, 1000000, mTimescale, &sampleIndex, findFlags); if (mode == ReadOptions::SEEK_CLOSEST) { |