commit 3b9912bcd428fcaeead1faf9297aee11b7fd1888
author Robert Shih <robertshih@google.com> Thu Apr 07 16:56:54 2016 -0700
committer Robert Shih <robertshih@google.com> Thu Apr 07 17:01:28 2016 -0700
tree 506a7657acdb44d02774ea1be125e3f6016db96c
parent b7b06be6ff2e6034a18986f94c76940b13ef4183

GenericSource: gracefully handle missing timestamp

Bug: 23474771
Change-Id: I1a1c03162fb08fa43607905ff2c6d4d594675001

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);