diff options
| author | Andreas Huber <andih@google.com> | 2012-10-23 13:25:05 -0700 |
|---|---|---|
| committer | Andreas Huber <andih@google.com> | 2012-10-23 13:25:05 -0700 |
| commit | 14744c076e2e361f049e8c3c43cef502ba3fcbd5 (patch) | |
| tree | 646a69117a34e964318ee365651e6806269d6e5f /media | |
| parent | 5f6f5b7d6be5d7882102bf0fc3c691ef8fbe03a1 (diff) | |
| download | frameworks_av-14744c076e2e361f049e8c3c43cef502ba3fcbd5.zip frameworks_av-14744c076e2e361f049e8c3c43cef502ba3fcbd5.tar.gz frameworks_av-14744c076e2e361f049e8c3c43cef502ba3fcbd5.tar.bz2 | |
Don't attempt to seek audio and video separately.
The widevine extractor doesn't deal too well with that...
Change-Id: Iadfeede4fe0c086af788c5639782854e4fbb98ff
related-to-bug: 7262386
Diffstat (limited to 'media')
| -rw-r--r-- | media/libstagefright/AwesomePlayer.cpp | 26 |
1 files changed, 17 insertions, 9 deletions
diff --git a/media/libstagefright/AwesomePlayer.cpp b/media/libstagefright/AwesomePlayer.cpp index 685e676..1e2625a 100644 --- a/media/libstagefright/AwesomePlayer.cpp +++ b/media/libstagefright/AwesomePlayer.cpp @@ -1707,7 +1707,8 @@ void AwesomePlayer::onVideoEvent() { } } - if ((mFlags & TEXTPLAYER_INITIALIZED) && !(mFlags & (TEXT_RUNNING | SEEK_PREVIEW))) { + if ((mFlags & TEXTPLAYER_INITIALIZED) + && !(mFlags & (TEXT_RUNNING | SEEK_PREVIEW))) { mTextDriver->start(); modifyFlags(TEXT_RUNNING, SET); } @@ -1753,17 +1754,24 @@ void AwesomePlayer::onVideoEvent() { && mAudioPlayer != NULL && mAudioPlayer->getMediaTimeMapping( &realTimeUs, &mediaTimeUs)) { - ALOGI("we're much too late (%.2f secs), video skipping ahead", - latenessUs / 1E6); + if (mWVMExtractor == NULL) { + ALOGI("we're much too late (%.2f secs), video skipping ahead", + latenessUs / 1E6); - mVideoBuffer->release(); - mVideoBuffer = NULL; + mVideoBuffer->release(); + mVideoBuffer = NULL; - mSeeking = SEEK_VIDEO_ONLY; - mSeekTimeUs = mediaTimeUs; + mSeeking = SEEK_VIDEO_ONLY; + mSeekTimeUs = mediaTimeUs; - postVideoEvent_l(); - return; + postVideoEvent_l(); + return; + } else { + // The widevine extractor doesn't deal well with seeking + // audio and video independently. We'll just have to wait + // until the decoder catches up, which won't be long at all. + ALOGI("we're very late (%.2f secs)", latenessUs / 1E6); + } } if (latenessUs > 40000) { |