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

Commit 29709b72 authored by Ray Essick's avatar Ray Essick Committed by Automerger Merge Worker
Browse files

Move an orphaned analytics reference under a mutex am: 8e4dd95f 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/12746987

Change-Id: Ic037f757f4b62adc0a2c86afcdb7865c9d7896e6
parents 2e4311e5 8e4dd95f

media/libmediaplayerservice/nuplayer/NuPlayerDriver.cpp

+2 −2
Original line number Diff line number Diff line
@@ -553,7 +553,6 @@ void NuPlayerDriver::updateMetrics(const char *where) { 
    // getDuration() uses mLock

    int duration_ms = -1;

    getDuration(&duration_ms);

    mAnalyticsItem->setInt64(kPlayerDuration, duration_ms);



    mPlayer->updateInternalTimers();
@@ -575,13 +574,14 @@ void NuPlayerDriver::updateMetrics(const char *where) { 
    // we also avoid any races within mAnalyticsItem machinery

    Mutex::Autolock autoLock(mMetricsLock);



    mAnalyticsItem->setInt64(kPlayerDuration, duration_ms);



    mAnalyticsItem->setInt64(kPlayerPlaying, (playingTimeUs+500)/1000 );



    if (mRebufferingEvents != 0) {

        mAnalyticsItem->setInt64(kPlayerRebuffering, (rebufferingTimeUs+500)/1000 );

        mAnalyticsItem->setInt32(kPlayerRebufferingCount, rebufferingEvents);

        mAnalyticsItem->setInt32(kPlayerRebufferingAtExit, rebufferingAtExit);



     }



    mAnalyticsItem->setCString(kPlayerDataSourceType, mPlayer->getDataSourceType());