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

Commit be3fc10e authored by Steve Kondik's avatar Steve Kondik Committed by Gerrit Code Review
Browse files

Merge "libstagefright: fix live RTSP streaming on some servers" into gingerbread

parents bf974f28 e5d652ca

media/libstagefright/rtsp/ARTPSource.cpp

+4 −1
Original line number Diff line number Diff line
@@ -109,7 +109,10 @@ void ARTPSource::timeUpdate(uint32_t rtpTime, uint64_t ntpTime) { 
            uint32_t rtpTime;

            CHECK(meta->findInt32("rtp-time", (int32_t *)&rtpTime));



            if (RTP2NTP(rtpTime) <= ntpTime)

                meta->setInt64("ntp-time", RTP2NTP(rtpTime));

            else

                meta->setInt64("ntp-time", ntpTime);

        }

    }

}

media/libstagefright/rtsp/ASessionDescription.cpp

+4 −0
Original line number Diff line number Diff line
@@ -249,6 +249,10 @@ bool ASessionDescription::getDurationUs(int64_t *durationUs) const { 
        return false;

    }



    if (value == "npt=0-") {

        return false;

    }



    if (strncmp(value.c_str(), "npt=", 4)) {

        return false;

    }

media/libstagefright/rtsp/MyHandler.h

+1 −1
Original line number Diff line number Diff line
@@ -922,7 +922,7 @@ struct MyHandler : public AHandler { 
        CHECK(GetAttribute(range.c_str(), "npt", &val));

        float npt1, npt2;



        if (val == "now-") {

        if (val == "now-" || val == "0-") {

            // This is a live stream and therefore not seekable.

            return;

        } else {