diff options
author | Lajos Molnar <lajos@google.com> | 2014-03-07 18:31:21 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-07 18:31:21 +0000 |
commit | b6ade3368127aa63a8f343a936f47aa6965b8361 (patch) | |
tree | 247804503f9b5d75f6b68d092248147ea4d55067 /media/libstagefright/httplive | |
parent | 6e785b82aefa8926b8b8dbca8588a0bf5f53a317 (diff) | |
parent | ad21a81af3e7d6b58002c9dce9c3278b6323e4a9 (diff) | |
download | frameworks_av-b6ade3368127aa63a8f343a936f47aa6965b8361.zip frameworks_av-b6ade3368127aa63a8f343a936f47aa6965b8361.tar.gz frameworks_av-b6ade3368127aa63a8f343a936f47aa6965b8361.tar.bz2 |
am ad21a81a: Merge "stagefright: Fix issue with tracking media format in packet source" into klp-dev
* commit 'ad21a81af3e7d6b58002c9dce9c3278b6323e4a9':
stagefright: Fix issue with tracking media format in packet source
Diffstat (limited to 'media/libstagefright/httplive')
-rw-r--r-- | media/libstagefright/httplive/PlaylistFetcher.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/media/libstagefright/httplive/PlaylistFetcher.cpp b/media/libstagefright/httplive/PlaylistFetcher.cpp index 1754bf2..f095987 100644 --- a/media/libstagefright/httplive/PlaylistFetcher.cpp +++ b/media/libstagefright/httplive/PlaylistFetcher.cpp @@ -861,12 +861,13 @@ status_t PlaylistFetcher::extractAndQueueAccessUnits( && source->dequeueAccessUnit(&accessUnit) == OK) { // Note that we do NOT dequeue any discontinuities. + // for simplicity, store a reference to the format in each unit + sp<MetaData> format = source->getFormat(); + if (format != NULL) { + accessUnit->meta()->setObject("format", format); + } packetSource->queueAccessUnit(accessUnit); } - - if (packetSource->getFormat() == NULL) { - packetSource->setFormat(source->getFormat()); - } } return OK; |