commit 1de83d5a634116c9b28490d5f5be61868fb8cbd1
author Wei Jia <wjia@google.com> Mon Oct 10 10:15:03 2016 -0700
committer Wei Jia <wjia@google.com> Mon Oct 10 10:15:03 2016 -0700
tree 8bd5855043e979445ccec03e8b10fcec77dd2fc2
parent 984be9311e2a9e16aa4e945e7548c2331455dbf1

NuPlayer: return error when neither audio nor video source has metadata.

Bug: 32045229
Change-Id: If300426aa502885d663b66a661e98b749ba4c9a9

media/libmediaplayerservice/nuplayer/NuPlayer.cpp

diff --git a/media/libmediaplayerservice/nuplayer/NuPlayer.cpp b/media/libmediaplayerservice/nuplayer/NuPlayer.cpp
index 134da14..dc4e5d4 100644
--- a/media/libmediaplayerservice/nuplayer/NuPlayer.cpp
+++ b/media/libmediaplayerservice/nuplayer/NuPlayer.cpp
@@ -1339,7 +1339,16 @@
     }
 
     sp<MetaData> audioMeta = mSource->getFormatMeta(true /* audio */);
+    sp<MetaData> videoMeta = mSource->getFormatMeta(false /* audio */);
+    if (audioMeta == NULL && videoMeta == NULL) {
+        ALOGE("no metadata for either audio or video source");
+        mSource->stop();
+        mSourceStarted = false;
+        notifyListener(MEDIA_ERROR, MEDIA_ERROR_UNKNOWN, ERROR_MALFORMED);
+        return;
+    }
     ALOGV_IF(audioMeta == NULL, "no metadata for audio source");  // video only stream
+
     audio_stream_type_t streamType = AUDIO_STREAM_MUSIC;
     if (mAudioSink != NULL) {
         streamType = mAudioSink->getAudioStreamType();