diff options
author | Lajos Molnar <lajos@google.com> | 2013-12-17 14:10:46 -0800 |
---|---|---|
committer | Lajos Molnar <lajos@google.com> | 2014-03-06 16:25:11 -0800 |
commit | e62d20268de87f63083896b5eef083d541078322 (patch) | |
tree | fce776fcf4d2eb288e7eae863932ae980c95b128 /media/libstagefright/httplive | |
parent | 6708a45ba1b5eacf583d5e80b2075b68940fe0ab (diff) | |
download | frameworks_av-e62d20268de87f63083896b5eef083d541078322.zip frameworks_av-e62d20268de87f63083896b5eef083d541078322.tar.gz frameworks_av-e62d20268de87f63083896b5eef083d541078322.tar.bz2 |
stagefright: Fix issue with tracking media format in packet source
Media format in AnotherPacketSource is now tracked across discontinuities.
This fixes a bug where format was set on queueAccessUnit and cleared on
dequeueAccessUnit, thereby allowing it to remain cleared.
Change-Id: I20975a630443f4a223a2b4344e8244f34b9560b9
Signed-off-by: Lajos Molnar <lajos@google.com>
Bug: 12060952
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; |