Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e17afa88 authored by Lajos Molnar's avatar Lajos Molnar
Browse files

Revert "mediaplayer: make frame-accurate avsync configurable" 

Reenable PTS scheduling for all playback.

This reverts commit 274084f7.

Bug: 18111837
Change-Id: Ia734ad304c1f85d2ac302261866be82b8f2a30d4
parent e662cd5c

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() {
@@ -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;

    }