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

Commit ee8116b0 authored by Wonsik Kim's avatar Wonsik Kim
Browse files

nuplayer: wait for sync point at renderer flush 

Bug: 136232244
Test: atest CtsMediaTestCases:MediaRandomTest#testPlayerRandomActionH264 (100 times)
Change-Id: I0a63df739fb15597130f50a12d6cddbe3ae815e8
parent 0e1c2008

media/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp

+25 −0
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ 
#include <media/stagefright/Utils.h>

#include <media/stagefright/VideoFrameScheduler.h>

#include <media/MediaCodecBuffer.h>

#include <utils/SystemClock.h>



#include <inttypes.h>
@@ -156,6 +157,7 @@ NuPlayer::Renderer::Renderer( 
    CHECK(mediaClock != NULL);

    mPlaybackRate = mPlaybackSettings.mSpeed;

    mMediaClock->setPlaybackRate(mPlaybackRate);

    (void)mSyncFlag.test_and_set();

}



NuPlayer::Renderer::~Renderer() {
@@ -326,9 +328,27 @@ void NuPlayer::Renderer::flush(bool audio, bool notifyComplete) { 
        mSyncQueues = false;

    }



    // Wait until the current job in the message queue is done, to make sure

    // buffer processing from the old generation is finished. After the current

    // job is finished, access to buffers are protected by generation.

    Mutex::Autolock syncLock(mSyncLock);

    int64_t syncCount = mSyncCount;

    mSyncFlag.clear();



    // Make sure message queue is not empty after mSyncFlag is cleared.

    sp<AMessage> msg = new AMessage(kWhatFlush, this);

    msg->setInt32("audio", static_cast<int32_t>(audio));

    msg->post();



    int64_t uptimeMs = uptimeMillis();

    while (mSyncCount == syncCount) {

        (void)mSyncCondition.waitRelative(mSyncLock, ms2ns(1000));

        if (uptimeMillis() - uptimeMs > 1000) {

            ALOGW("flush(): no wake-up from sync point for 1s; stop waiting to "

                  "prevent being stuck indefinitely.");

            break;

        }

    }

}



void NuPlayer::Renderer::signalTimeDiscontinuity() {
@@ -781,6 +801,11 @@ void NuPlayer::Renderer::onMessageReceived(const sp<AMessage> &msg) { 
            TRESPASS();

            break;

    }

    if (!mSyncFlag.test_and_set()) {

        Mutex::Autolock syncLock(mSyncLock);

        ++mSyncCount;

        mSyncCondition.broadcast();

    }

}



void NuPlayer::Renderer::postDrainAudioQueue_l(int64_t delayUs) {

media/libmediaplayerservice/nuplayer/NuPlayerRenderer.h

+7 −0
Original line number Diff line number Diff line
@@ -18,6 +18,8 @@ 


#define NUPLAYER_RENDERER_H_



#include <atomic>



#include <media/AudioResamplerPublic.h>

#include <media/AVSyncSettings.h>
@@ -220,6 +222,11 @@ private: 


    sp<AWakeLock> mWakeLock;



    std::atomic_flag mSyncFlag = ATOMIC_FLAG_INIT;

    Mutex mSyncLock;

    Condition mSyncCondition;

    int64_t mSyncCount{0};



    status_t getCurrentPositionOnLooper(int64_t *mediaUs);

    status_t getCurrentPositionOnLooper(

            int64_t *mediaUs, int64_t nowUs, bool allowPastQueuedVideo = false);