commit 309aa8bf5e4cd66fe988adf2654cac3fadc2a1c3
author Robert Shih <robertshih@google.com> Tue Jul 29 18:34:36 2014 -0700
committer Robert Shih <robertshih@google.com> Tue Aug 05 20:46:56 2014 -0700
tree 7958aa68f244c1f1d0d8b98efe934d1c3d60ce2d
parent 3423bbdb05f843a64356fa24e8657f03ecbb7d65

httplive: timestamp reporting, track selection

Bug: 15153976
Bug: 15763638
Bug: 16351654
Change-Id: I4462276d4b7342647286a0ca4be11692ce52ff6d

media/libmediaplayerservice/nuplayer/GenericSource.cpp

diff --git a/media/libmediaplayerservice/nuplayer/GenericSource.cpp b/media/libmediaplayerservice/nuplayer/GenericSource.cpp
index 2f5b0f1..ebc3d08 100644
--- a/media/libmediaplayerservice/nuplayer/GenericSource.cpp
+++ b/media/libmediaplayerservice/nuplayer/GenericSource.cpp
@@ -308,7 +308,7 @@
 
           int64_t timeUs, actualTimeUs;
           const bool formatChange = true;
-          sp<AMessage> latestMeta = track->mPackets->getLatestMeta();
+          sp<AMessage> latestMeta = track->mPackets->getLatestEnqueuedMeta();
           CHECK(latestMeta != NULL && latestMeta->findInt64("timeUs", &timeUs));
           readBuffer(trackType, timeUs, &actualTimeUs, formatChange);
           readBuffer(counterpartType, -1, NULL, formatChange);