Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 407ec58c: Merge "A better fix for the OggExtractor referring to the sample rate while it hasn\'t been initialized yet." into gingerbread

Browse Source 
Merge commit '407ec58c6604da3255b04aa99577515deba3a26f' into gingerbread-plus-aosp

* commit '407ec58c6604da3255b04aa99577515deba3a26f':
  A better fix for the OggExtractor referring to the sample rate while it hasn't been initialized yet.
This commit is contained in:
Andreas Huber
2010-08-05 10:13:26 -07:00
committed by Android Git Automerger
parent 983d4583e7 407ec58c66
commit 2405988fa0
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
media/libstagefright/OggExtractor.cpp
View File

@@ -361,11 +361,17 @@ status_t MyVorbisExtractor::readNextPacket(MediaBuffer **out) {
memcpy(tmp->data(), buffer->data(), buffer->range_length()); memcpy(tmp->data(), buffer->data(), buffer->range_length());
tmp->set_range(0, buffer->range_length()); tmp->set_range(0, buffer->range_length());
buffer->release(); buffer->release();
} else if (mVi.rate) { } else {
// XXX Not only is this not technically the correct time for // XXX Not only is this not technically the correct time for
// this packet, we also stamp every packet in this page // this packet, we also stamp every packet in this page
// with the same time. This needs fixing later. // with the same time. This needs fixing later.
timeUs = mCurrentPage.mGranulePosition * 1000000ll / mVi.rate;
if (mVi.rate) {
// Rate may not have been initialized yet if we're currently
// reading the configuration packets...
// Fortunately, the timestamp doesn't matter for those.
timeUs = mCurrentPage.mGranulePosition * 1000000ll / mVi.rate;
}
tmp->set_range(0, 0); tmp->set_range(0, 0);
} }
buffer = tmp; buffer = tmp;