diff options
author | Lajos Molnar <lajos@google.com> | 2014-05-02 17:11:14 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-05-02 17:11:14 +0000 |
commit | f9782266802b02fc06a9c532f40128496aefb3e0 (patch) | |
tree | b198af2c74d7c6b2b720a3093ffa2b1104c89de9 /media/libstagefright | |
parent | a69d6f529239950a8bdf5e4253ea13bb029375cb (diff) | |
parent | 9747b68530aa65b04751b43bf4ce3385b5d781f9 (diff) | |
download | frameworks_av-f9782266802b02fc06a9c532f40128496aefb3e0.zip frameworks_av-f9782266802b02fc06a9c532f40128496aefb3e0.tar.gz frameworks_av-f9782266802b02fc06a9c532f40128496aefb3e0.tar.bz2 |
Merge "AwesomePlayer: improve scheduling of video event to hit PTS"
Diffstat (limited to 'media/libstagefright')
-rw-r--r-- | media/libstagefright/AwesomePlayer.cpp | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/media/libstagefright/AwesomePlayer.cpp b/media/libstagefright/AwesomePlayer.cpp index 0dd867c..391392e 100644 --- a/media/libstagefright/AwesomePlayer.cpp +++ b/media/libstagefright/AwesomePlayer.cpp @@ -1944,8 +1944,9 @@ void AwesomePlayer::onVideoEvent() { } if (latenessUs < -10000) { - // We're more than 10ms early. - postVideoEvent_l(10000); + // We're more than 10ms early. Try to schedule at least 12ms + // early (to hit this same check), or just on time. + postVideoEvent_l(latenessUs < -22000 ? 10000 : -latenessUs); return; } } @@ -2009,7 +2010,10 @@ void AwesomePlayer::onVideoEvent() { int64_t nextTimeUs; CHECK(mVideoBuffer->meta_data()->findInt64(kKeyTime, &nextTimeUs)); int64_t delayUs = nextTimeUs - ts->getRealTimeUs() + mTimeSourceDeltaUs; - postVideoEvent_l(delayUs > 10000 ? 10000 : delayUs < 0 ? 0 : delayUs); + ATRACE_INT("Frame delta (ms)", (nextTimeUs - timeUs) / 1E3); + ALOGV("next frame in %" PRId64, delayUs); + // try to schedule at least 12ms before due time, or just on time + postVideoEvent_l(delayUs > 22000 ? 10000 : delayUs < 0 ? 0 : delayUs); return; } |