diff options
| author | Robert Shih <robertshih@google.com> | 2014-08-06 23:19:17 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-08-06 17:14:55 +0000 |
| commit | 0893eaf7d21e3a50b81324673eaa91a6b77a39c2 (patch) | |
| tree | 3bdedd121260198b93c7d91f5d48ba6c58147d3f /media/libmediaplayerservice/nuplayer/GenericSource.cpp | |
| parent | 29e09664c2c5b49d78f2666d38a812502a36e26b (diff) | |
| parent | 309aa8bf5e4cd66fe988adf2654cac3fadc2a1c3 (diff) | |
| download | frameworks_av-0893eaf7d21e3a50b81324673eaa91a6b77a39c2.zip frameworks_av-0893eaf7d21e3a50b81324673eaa91a6b77a39c2.tar.gz frameworks_av-0893eaf7d21e3a50b81324673eaa91a6b77a39c2.tar.bz2 | |
Merge "httplive: timestamp reporting, track selection" into lmp-dev
Diffstat (limited to 'media/libmediaplayerservice/nuplayer/GenericSource.cpp')
| -rw-r--r-- | media/libmediaplayerservice/nuplayer/GenericSource.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/media/libmediaplayerservice/nuplayer/GenericSource.cpp b/media/libmediaplayerservice/nuplayer/GenericSource.cpp index a18407f..9df3f53 100644 --- a/media/libmediaplayerservice/nuplayer/GenericSource.cpp +++ b/media/libmediaplayerservice/nuplayer/GenericSource.cpp @@ -290,7 +290,7 @@ void NuPlayer::GenericSource::onMessageReceived(const sp<AMessage> &msg) { 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); |