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

Commit ecceee9a authored by Andreas Huber's avatar Andreas Huber Committed by Android Git Automerger
Browse files

am ff29e486: am 9ec3547e: Merge "For an RTSP live stream we won\'t map rtp... 

am ff29e486: am 9ec3547e: Merge "For an RTSP live stream we won\'t map rtp time to normal play time," into jb-dev

* commit 'ff29e486':
  For an RTSP live stream we won't map rtp time to normal play time,
parents 726f9929 ff29e486

media/libmediaplayerservice/nuplayer/RTSPSource.cpp

+3 −8
Original line number Diff line number Diff line
@@ -276,14 +276,9 @@ void NuPlayer::RTSPSource::onMessageReceived(const sp<AMessage> &msg) { 


                if (!info->mNPTMappingValid) {

                    // This is a live stream, we didn't receive any normal

                    // playtime mapping. Assume the first packets correspond

                    // to time 0.



                    ALOGV("This is a live stream, assuming time = 0");



                    info->mRTPTime = rtpTime;

                    info->mNormalPlaytimeUs = 0ll;

                    info->mNPTMappingValid = true;

                    // playtime mapping. We won't map to npt time.

                    source->queueAccessUnit(accessUnit);

                    break;

                }



                int64_t nptUs =