commit 71e8360bea6a986d7273ae06c68f9f7fee8c0f8f
author Robert Shih <robertshih@google.com> Fri Apr 08 16:09:19 2016 +0000
committer android-build-merger <android-build-merger@google.com> Fri Apr 08 16:09:19 2016 +0000
tree 8b19d81ab4e25bd262688d34bdb70f8afeafc61b
parent dfc74e192e73ac455fbe40263feab6b2e2b22e6f
parent 3a84ca40e933a8e82d4a9c75da4fba3338ec2acf

Merge "GenericSource: gracefully handle missing timestamp" into nyc-dev am: 8e4f62e
am: 3a84ca4

* commit '3a84ca40e933a8e82d4a9c75da4fba3338ec2acf':
  GenericSource: gracefully handle missing timestamp

Change-Id: Id97543fb2dc3c0722633d4d01c99459fb3173846

media/libmediaplayerservice/nuplayer/GenericSource.cpp

diff --git a/media/libmediaplayerservice/nuplayer/GenericSource.cpp b/media/libmediaplayerservice/nuplayer/GenericSource.cpp
index 08ac941..81aafbe 100644
--- a/media/libmediaplayerservice/nuplayer/GenericSource.cpp
+++ b/media/libmediaplayerservice/nuplayer/GenericSource.cpp
@@ -1428,7 +1428,11 @@
 
         if (err == OK) {
             int64_t timeUs;
-            CHECK(mbuf->meta_data()->findInt64(kKeyTime, &timeUs));
+            if (!mbuf->meta_data()->findInt64(kKeyTime, &timeUs)) {
+                mbuf->meta_data()->dumpToLog();
+                track->mPackets->signalEOS(ERROR_MALFORMED);
+                break;
+            }
             if (trackType == MEDIA_TRACK_TYPE_AUDIO) {
                 mAudioTimeUs = timeUs;
                 mBufferingMonitor->updateQueuedTime(true /* isAudio */, timeUs);