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

Commit bca1c65f authored by Andreas Huber's avatar Andreas Huber Committed by Android (Google) Code Review
Browse files

Merge "Previous change broke A/V sync, this is a better change to eliminate... 

Merge "Previous change broke A/V sync, this is a better change to eliminate negative media positions."
parents 348f7b90 065f69ef

media/libstagefright/AudioPlayer.cpp

+7 −3
Original line number Diff line number Diff line
@@ -252,8 +252,7 @@ void AudioPlayer::fillBuffer(void *data, size_t size) { 
                        kKeyTime, &mPositionTimeMediaUs));



            mPositionTimeRealUs =

                -mLatencyUs

                + ((mNumFramesPlayed + size_done / mFrameSize) * 1000000)

                ((mNumFramesPlayed + size_done / mFrameSize) * 1000000)

                    / mSampleRate;



            LOGV("buffer->size() = %d, "
@@ -305,7 +304,12 @@ int64_t AudioPlayer::getMediaTimeUs() { 
        return 0;

    }



    return mPositionTimeMediaUs + (getRealTimeUsLocked() - mPositionTimeRealUs);

    int64_t realTimeOffset = getRealTimeUsLocked() - mPositionTimeRealUs;

    if (realTimeOffset < 0) {

        realTimeOffset = 0;

    }



    return mPositionTimeMediaUs + realTimeOffset;

}



bool AudioPlayer::getMediaTimeMapping(