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

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

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

parents 46dd1e86 a6925e61

media/libstagefright/rtsp/ASessionDescription.cpp

+3 −0
Original line number Diff line number Diff line
@@ -301,6 +301,9 @@ 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

+4 −2
Original line number Diff line number Diff line
@@ -995,10 +995,12 @@ 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.

            return;

            seekable = false;

        }



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

        }



        mSeekable = true;

        mSeekable = seekable;

    }



    sp<APacketSource> getPacketSource(size_t index) {