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

Commit 466786b2 authored by Lajos Molnar's avatar Lajos Molnar Committed by Android Git Automerger
Browse files

am 70cc5bdc: Merge changes Ic46e3069,Idc92716b into klp-dev 

* commit '70cc5bdc':
  LiveSession: fix incorrect stream key (subtitle"s")
  M3UParser: trim spaces when parsing comma separated codecs.
parents 5b297ba7 70cc5bdc

media/libstagefright/httplive/LiveSession.cpp

+1 −1
Original line number Diff line number Diff line
@@ -75,7 +75,7 @@ LiveSession::LiveSession( 


    mStreams[kAudioIndex] = StreamItem("audio");

    mStreams[kVideoIndex] = StreamItem("video");

    mStreams[kSubtitleIndex] = StreamItem("subtitle");

    mStreams[kSubtitleIndex] = StreamItem("subtitles");



    for (size_t i = 0; i < kMaxStreams; ++i) {

        mPacketSources.add(indexToType(i), new AnotherPacketSource(NULL /* meta */));

media/libstagefright/httplive/M3UParser.cpp

+1 −0
Original line number Diff line number Diff line
@@ -365,6 +365,7 @@ bool M3UParser::getTypeURI(size_t index, const char *key, AString *uri) const { 
            codecs.append(',');

            while ((commaPos = codecs.find(",", offset)) >= 0) {

                AString codec(codecs, offset, commaPos - offset);

                codec.trim();

                // return true only if a codec of type `key` ("audio"/"video")

                // is found.

                if (codecIsType(codec, key)) {