commit a9480af50786a357260a04430a9ac94526cbd043
author Wei Jia <wjia@google.com> Tue Oct 11 00:43:08 2016 +0000
committer android-build-merger <android-build-merger@google.com> Tue Oct 11 00:43:08 2016 +0000
tree 17c8474a130ee5b4dab92b790d92e4275da9f355
parent 038295e6966d52c36420b0af0d3f8833a9baa18c
parent 3079cc4a03be6d12f55dc1589038acacfd87fcd3

NuPlayer: return error when neither audio nor video source has metadata. am: 1de83d5a63 am: bd6081a604
am: 3079cc4a03

Change-Id: I7e8cf8dc466c642c71f3ca92db8e81c9b83c61a8

media/libmediaplayerservice/nuplayer/NuPlayer.cpp

diff --git a/media/libmediaplayerservice/nuplayer/NuPlayer.cpp b/media/libmediaplayerservice/nuplayer/NuPlayer.cpp
index ac49993..7178661 100644
--- a/media/libmediaplayerservice/nuplayer/NuPlayer.cpp
+++ b/media/libmediaplayerservice/nuplayer/NuPlayer.cpp
@@ -1340,7 +1340,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();