diff options
author | Lajos Molnar <lajos@google.com> | 2014-11-07 17:20:58 -0800 |
---|---|---|
committer | Lajos Molnar <lajos@google.com> | 2014-11-07 17:24:09 -0800 |
commit | e17afa888040eb5fbd31249305efd88ee03bb5bc (patch) | |
tree | c079294242bc00130c022194b085aaf635bf4e2a /media | |
parent | e662cd5cdbe1312d6b74754d2945fffe99e4fe2c (diff) | |
download | frameworks_av-e17afa888040eb5fbd31249305efd88ee03bb5bc.zip frameworks_av-e17afa888040eb5fbd31249305efd88ee03bb5bc.tar.gz frameworks_av-e17afa888040eb5fbd31249305efd88ee03bb5bc.tar.bz2 |
Revert "mediaplayer: make frame-accurate avsync configurable"
Reenable PTS scheduling for all playback.
This reverts commit 274084f7bfd3f6bdf5a55cf16ceefed345aa0060.
Bug: 18111837
Change-Id: Ia734ad304c1f85d2ac302261866be82b8f2a30d4
Diffstat (limited to 'media')
-rw-r--r-- | media/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/media/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp b/media/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp index 5d9001c..6b1c854 100644 --- a/media/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp +++ b/media/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp @@ -20,8 +20,6 @@ #include "NuPlayerRenderer.h" -#include <cutils/properties.h> - #include <media/stagefright/foundation/ABuffer.h> #include <media/stagefright/foundation/ADebug.h> #include <media/stagefright/foundation/AMessage.h> @@ -43,16 +41,6 @@ static const int64_t kOffloadPauseMaxUs = 10000000ll; // static const int64_t NuPlayer::Renderer::kMinPositionUpdateDelayUs = 100000ll; -static bool sFrameAccurateAVsync = false; - -static void readProperties() { - char value[PROPERTY_VALUE_MAX]; - if (property_get("persist.sys.media.avsync", value, NULL)) { - sFrameAccurateAVsync = - !strcmp("1", value) || !strcasecmp("true", value); - } -} - NuPlayer::Renderer::Renderer( const sp<MediaPlayerBase::AudioSink> &sink, const sp<AMessage> ¬ify, @@ -87,7 +75,6 @@ NuPlayer::Renderer::Renderer( mCurrentOffloadInfo(AUDIO_INFO_INITIALIZER), mTotalBuffersQueued(0), mLastAudioBufferDrained(0) { - readProperties(); } NuPlayer::Renderer::~Renderer() { @@ -792,11 +779,6 @@ void NuPlayer::Renderer::postDrainVideoQueue() { ALOGW_IF(delayUs > 500000, "unusually high delayUs: %" PRId64, delayUs); // post 2 display refreshes before rendering is due - // FIXME currently this increases power consumption, so unless frame-accurate - // AV sync is requested, post closer to required render time (at 0.63 vsyncs) - if (!sFrameAccurateAVsync) { - twoVsyncsUs >>= 4; - } msg->post(delayUs > twoVsyncsUs ? delayUs - twoVsyncsUs : 0); mDrainVideoQueuePending = true; @@ -1174,8 +1156,6 @@ void NuPlayer::Renderer::onPause() { } void NuPlayer::Renderer::onResume() { - readProperties(); - if (!mPaused) { return; } |