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

fix unintentional drift

Browse Source 
Change-Id: I0bbf3d3f95296a41d71558d8de1ed2ed021f21cf
This commit is contained in:
Jean-Baptiste Queru
2010-04-14 10:40:28 -07:00
parent 0b23c1436a
commit 31a17033dc
2 changed files with 25 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
media/libstagefright/AwesomePlayer.cpp
View File

@@ -444,6 +444,8 @@ void AwesomePlayer::onBufferingUpdate() {
notifyListener_l(MEDIA_BUFFERING_UPDATE, percentage * 100.0);
postBufferingEvent_l();
} else {
LOGE("Not sending buffering status because duration is unknown.");
}
}
@@ -552,8 +554,6 @@ status_t AwesomePlayer::play_l() {
seekAudioIfNecessary_l();
}
postBufferingEvent_l();
if (mFlags & AT_EOS) {
// Legacy behaviour, if a stream finishes playing and then
// is started again, we play from the start...
@@ -1230,6 +1230,8 @@ void AwesomePlayer::onPrepareAsyncEvent() {
mFlags |= PREPARED;
mAsyncPrepareEvent = NULL;
mPreparedCondition.broadcast();
postBufferingEvent_l();
}
status_t AwesomePlayer::suspend() {

35
media/libstagefright/codecs/aacdec/AACDecoder.cpp
View File

@@ -203,25 +203,32 @@ status_t AACDecoder::read(
Int decoderErr = PVMP4AudioDecodeFrame(mConfig, mDecoderBuf);
size_t numOutBytes =
mConfig->frameLength * sizeof(int16_t) * mConfig->desiredChannels;
if (decoderErr != MP4AUDEC_SUCCESS) {
LOGE("AAC decoder returned error %d", decoderErr);
LOGW("AAC decoder returned error %d, substituting silence", decoderErr);
buffer->release();
buffer = NULL;
memset(buffer->data(), 0, numOutBytes);
return ERROR_MALFORMED;
}
buffer->set_range(
0, mConfig->frameLength * sizeof(int16_t) * mConfig->desiredChannels);
mInputBuffer->set_range(
mInputBuffer->range_offset() + mConfig->inputBufferUsedLength,
mInputBuffer->range_length() - mConfig->inputBufferUsedLength);
if (mInputBuffer->range_length() == 0) {
// Discard input buffer.
mInputBuffer->release();
mInputBuffer = NULL;
// fall through
}
buffer->set_range(0, numOutBytes);
if (mInputBuffer != NULL) {
mInputBuffer->set_range(
mInputBuffer->range_offset() + mConfig->inputBufferUsedLength,
mInputBuffer->range_length() - mConfig->inputBufferUsedLength);
if (mInputBuffer->range_length() == 0) {
mInputBuffer->release();
mInputBuffer = NULL;
}
}
buffer->meta_data()->setInt64(