Merge "Revert "mediaplayer: make frame-accurate avsync configurable"" into lmp-mr1-dev (6641004b) · Commits · e / os / android_frameworks_av

media/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp

+0 −20

Original line number	Diff line number	Diff line
		@@ -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> &notify,
		@@ -87,7 +75,6 @@ NuPlayer::Renderer::Renderer(
		mCurrentOffloadInfo(AUDIO_INFO_INITIALIZER),
		mTotalBuffersQueued(0),
		mLastAudioBufferDrained(0) {
		readProperties();
		}

		NuPlayer::Renderer::~Renderer() {
		@@ -796,11 +783,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;
		@@ -1178,8 +1160,6 @@ void NuPlayer::Renderer::onPause() {
		}

		void NuPlayer::Renderer::onResume() {
		readProperties();

		if (!mPaused) {
		return;
		}