diff options
author | Robert Shih <robertshih@google.com> | 2015-06-09 17:30:26 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-06-09 17:30:28 +0000 |
commit | f028dad745f85066abc0229d61c0d837f40dc000 (patch) | |
tree | 311f584a06de78f4cdcb8b836ef8312e72662777 /media/libstagefright | |
parent | c75a989a38a157d48ca34bf127d5b4533e9356a7 (diff) | |
parent | 819bcef03907c8df8fc0fa78c0d43db98279ffa9 (diff) | |
download | frameworks_av-f028dad745f85066abc0229d61c0d837f40dc000.zip frameworks_av-f028dad745f85066abc0229d61c0d837f40dc000.tar.gz frameworks_av-f028dad745f85066abc0229d61c0d837f40dc000.tar.bz2 |
Merge "Ogg Opus: handle cases where first sample has non 0 time" into mnc-dev
Diffstat (limited to 'media/libstagefright')
-rw-r--r-- | media/libstagefright/OggExtractor.cpp | 39 |
1 files changed, 38 insertions, 1 deletions
diff --git a/media/libstagefright/OggExtractor.cpp b/media/libstagefright/OggExtractor.cpp index 2451641..1c663a3 100644 --- a/media/libstagefright/OggExtractor.cpp +++ b/media/libstagefright/OggExtractor.cpp @@ -191,7 +191,8 @@ struct MyOpusExtractor : public MyOggExtractor { MyOpusExtractor(const sp<DataSource> &source) : MyOggExtractor(source, MEDIA_MIMETYPE_AUDIO_OPUS, /*numHeaders*/ 2, kOpusSeekPreRollUs), mChannelCount(0), - mCodecDelay(0) { + mCodecDelay(0), + mStartGranulePosition(-1) { } virtual uint64_t approxBitrate() const { @@ -211,6 +212,7 @@ private: uint8_t mChannelCount; uint16_t mCodecDelay; + int64_t mStartGranulePosition; }; static void extractAlbumArt( @@ -557,6 +559,37 @@ ssize_t MyOggExtractor::readPage(off64_t offset, Page *page) { } status_t MyOpusExtractor::readNextPacket(MediaBuffer **out) { + if (mOffset <= mFirstDataOffset && mStartGranulePosition < 0) { + // The first sample might not start at time 0; find out where by subtracting + // the number of samples on the first page from the granule position + // (position of last complete sample) of the first page. This happens + // the first time before we attempt to read a packet from the first page. + MediaBuffer *mBuf; + uint32_t numSamples = 0; + uint64_t curGranulePosition = 0; + while (true) { + status_t err = _readNextPacket(&mBuf, /* calcVorbisTimestamp = */false); + if (err != OK && err != ERROR_END_OF_STREAM) { + return err; + } + // First two pages are header pages. + if (err == ERROR_END_OF_STREAM || mCurrentPage.mPageNo > 2) { + break; + } + curGranulePosition = mCurrentPage.mGranulePosition; + numSamples += getNumSamplesInPacket(mBuf); + mBuf->release(); + mBuf = NULL; + } + + if (curGranulePosition > numSamples) { + mStartGranulePosition = curGranulePosition - numSamples; + } else { + mStartGranulePosition = 0; + } + seekToOffset(0); + } + status_t err = _readNextPacket(out, /* calcVorbisTimestamp = */false); if (err != OK) { return err; @@ -567,6 +600,10 @@ status_t MyOpusExtractor::readNextPacket(MediaBuffer **out) { // We assume that we only seek to page boundaries. if ((*out)->meta_data()->findInt32(kKeyValidSamples, ¤tPageSamples)) { // first packet in page + if (mOffset == mFirstDataOffset) { + currentPageSamples -= mStartGranulePosition; + (*out)->meta_data()->setInt32(kKeyValidSamples, currentPageSamples); + } mCurGranulePosition = mCurrentPage.mGranulePosition - currentPageSamples; } |