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

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

Merge "Revert "Parse RTP-Info even for live streams.""

parents e5bf6409 ac5767a9

media/libstagefright/rtsp/ASessionDescription.cpp

+0 −3
Original line number Diff line number Diff line
@@ -301,9 +301,6 @@ void ASessionDescription::ParseFormatDesc( 
// static

bool ASessionDescription::parseNTPRange(

        const char *s, float *npt1, float *npt2) {

    *npt1 = 0.0f;

    *npt2 = 0.0f;



    if (s[0] == '-') {

        return false;  // no start time available.

    }

media/libstagefright/rtsp/MyHandler.h

+2 −4
Original line number Diff line number Diff line
@@ -995,12 +995,10 @@ struct MyHandler : public AHandler { 
        AString val;

        CHECK(GetAttribute(range.c_str(), "npt", &val));



        bool seekable = true;



        float npt1, npt2;

        if (!ASessionDescription::parseNTPRange(val.c_str(), &npt1, &npt2)) {

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

            seekable = false;

            return;

        }



        i = response->mHeaders.indexOfKey("rtp-info");
@@ -1046,7 +1044,7 @@ struct MyHandler : public AHandler { 
            ++n;

        }



        mSeekable = seekable;

        mSeekable = true;

    }



    sp<APacketSource> getPacketSource(size_t index) {