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

am 88a995ed: Merge "Properly flush the AudioTrack/AudioSink on a seek request and make sure that both the mp3 decoder and aac software decoders start fresh after a seek without any dependency on previously decoded content." into gingerbread

Browse Source 
Merge commit '88a995edcf3c371845cb32aed8bcddb7509bf875' into gingerbread-plus-aosp

* commit '88a995edcf3c371845cb32aed8bcddb7509bf875':
  Properly flush the AudioTrack/AudioSink on a seek request and make sure that both the mp3 decoder and aac software decoders start fresh after a seek without any dependency on previously decoded content.
This commit is contained in:
Andreas Huber
2010-09-28 13:26:26 -07:00
committed by Android Git Automerger
parent 0d44776016 88a995edcf
commit 387bdcdadc
3 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
media/libstagefright/AudioPlayer.cpp
View File

@@ -423,6 +423,12 @@ status_t AudioPlayer::seekTo(int64_t time_us) {
mReachedEOS = false; mReachedEOS = false;
mSeekTimeUs = time_us; mSeekTimeUs = time_us;
if (mAudioSink != NULL) {
mAudioSink->flush();
} else {
mAudioTrack->flush();
}
return OK; return OK;
} }

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

@@ -171,6 +171,10 @@ status_t AACDecoder::read(
mInputBuffer->release(); mInputBuffer->release();
mInputBuffer = NULL; mInputBuffer = NULL;
} }
// Make sure that the next buffer output does not still
// depend on fragments from the last one decoded.
PVMP4AudioDecoderResetBuffer(mDecoderBuf);
} else { } else {
seekTimeUs = -1; seekTimeUs = -1;
} }

4
media/libstagefright/codecs/mp3dec/MP3Decoder.cpp
View File

@@ -132,6 +132,10 @@ status_t MP3Decoder::read(
mInputBuffer->release(); mInputBuffer->release();
mInputBuffer = NULL; mInputBuffer = NULL;
} }
// Make sure that the next buffer output does not still
// depend on fragments from the last one decoded.
pvmp3_InitDecoder(mConfig, mDecoderBuf);
} else { } else {
seekTimeUs = -1; seekTimeUs = -1;
} }