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

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

Merge "Work around several issues with non-compliant RTSP servers."

parents 5101e1ed 0407269a

media/libstagefright/rtsp/AMPEG4ElementaryAssembler.cpp

+1 −1
Original line number Diff line number Diff line
@@ -104,7 +104,7 @@ AMPEG4ElementaryAssembler::AMPEG4ElementaryAssembler( 
      mNextExpectedSeqNoValid(false),

      mNextExpectedSeqNo(0),

      mAccessUnitDamaged(false) {

    mIsGeneric = desc.startsWith("mpeg4-generic/");

    mIsGeneric = !strncasecmp(desc.c_str(),"mpeg4-generic/", 14);



    if (mIsGeneric) {

        AString value;

media/libstagefright/rtsp/APacketSource.cpp

+1 −1
Original line number Diff line number Diff line
@@ -637,7 +637,7 @@ APacketSource::APacketSource( 


        mFormat->setInt32(kKeyWidth, width);

        mFormat->setInt32(kKeyHeight, height);

    } else if (!strncmp(desc.c_str(), "mpeg4-generic/", 14)) {

    } else if (!strncasecmp(desc.c_str(), "mpeg4-generic/", 14)) {

        AString val;

        if (!GetAttribute(params.c_str(), "mode", &val)

                || (strcasecmp(val.c_str(), "AAC-lbr")

media/libstagefright/rtsp/ARTPConnection.cpp

+3 −1
Original line number Diff line number Diff line
@@ -123,7 +123,7 @@ void ARTPConnection::MakePortPair( 
        struct sockaddr_in addr;

        memset(addr.sin_zero, 0, sizeof(addr.sin_zero));

        addr.sin_family = AF_INET;

        addr.sin_addr.s_addr = INADDR_ANY;

        addr.sin_addr.s_addr = htonl(INADDR_ANY);

        addr.sin_port = htons(port);



        if (bind(*rtpSocket,
@@ -340,6 +340,8 @@ void ARTPConnection::onPollStreams() { 
}



status_t ARTPConnection::receive(StreamInfo *s, bool receiveRTP) {

    LOGV("receiving %s", receiveRTP ? "RTP" : "RTCP");



    CHECK(!s->mIsInjected);



    sp<ABuffer> buffer = new ABuffer(65536);

media/libstagefright/rtsp/ARTPSource.cpp

+1 −1
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ ARTPSource::ARTPSource( 
    } else  if (!strncmp(desc.c_str(), "AMR-WB/", 7)) {

        mAssembler = new AAMRAssembler(notify, true /* isWide */, params);

    } else if (!strncmp(desc.c_str(), "MP4V-ES/", 8)

            || !strncmp(desc.c_str(), "mpeg4-generic/", 14)) {

            || !strncasecmp(desc.c_str(), "mpeg4-generic/", 14)) {

        mAssembler = new AMPEG4ElementaryAssembler(notify, desc, params);

        mIssueFIRRequests = true;

    } else {

media/libstagefright/rtsp/ASessionDescription.cpp

+5 −0
Original line number Diff line number Diff line
@@ -71,6 +71,11 @@ bool ASessionDescription::parse(const void *data, size_t size) { 
            line.setTo(desc, i, eolPos - i);

        }



        if (line.empty()) {

            i = eolPos + 1;

            continue;

        }



        if (line.size() < 2 || line.c_str()[1] != '=') {

            return false;

        }