diff options
| author | Lajos Molnar <lajos@google.com> | 2014-03-14 04:10:37 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-14 04:10:37 +0000 |
| commit | 466786b25b262f4f6e5737b3a88e8d7f6916e45c (patch) | |
| tree | 087a22072dafb9f57e217db19a3a62deced90009 /media | |
| parent | 5b297ba76271e8554758cbd569e73720bc914af6 (diff) | |
| parent | 70cc5bdc0fca3f67f3602f04152c29323cad99df (diff) | |
| download | frameworks_av-466786b25b262f4f6e5737b3a88e8d7f6916e45c.zip frameworks_av-466786b25b262f4f6e5737b3a88e8d7f6916e45c.tar.gz frameworks_av-466786b25b262f4f6e5737b3a88e8d7f6916e45c.tar.bz2 | |
am 70cc5bdc: Merge changes Ic46e3069,Idc92716b into klp-dev
* commit '70cc5bdc0fca3f67f3602f04152c29323cad99df':
LiveSession: fix incorrect stream key (subtitle"s")
M3UParser: trim spaces when parsing comma separated codecs.
Diffstat (limited to 'media')
| -rw-r--r-- | media/libstagefright/httplive/LiveSession.cpp | 2 | ||||
| -rw-r--r-- | media/libstagefright/httplive/M3UParser.cpp | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/media/libstagefright/httplive/LiveSession.cpp b/media/libstagefright/httplive/LiveSession.cpp index c1c3e2b..3e11759 100644 --- a/media/libstagefright/httplive/LiveSession.cpp +++ b/media/libstagefright/httplive/LiveSession.cpp @@ -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 */)); diff --git a/media/libstagefright/httplive/M3UParser.cpp b/media/libstagefright/httplive/M3UParser.cpp index 4c2c1f4..e31ad40 100644 --- a/media/libstagefright/httplive/M3UParser.cpp +++ b/media/libstagefright/httplive/M3UParser.cpp @@ -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)) { |