commit 02103bb21c90abdca4e4ba91f7e3e007a82e01fd
author Wei Jia <wjia@google.com> Fri Sep 18 10:04:09 2015 -0700
committer The Android Automerger <android-build@google.com> Mon Sep 28 17:08:19 2015 -0700
tree 46166478a8d35aca23b3f60e86c904d261f1f535
parent 74814b70482b3b9eb7f5d979b1d8f76a6eb56667

StagefrightMetadataRetriever: handle error returned from convertMetaDataToMessage().

Bug: 23680780
Change-Id: I09dbbf95b2c874b9760938646e48a7ed543f1577

media/libstagefright/StagefrightMetadataRetriever.cpp

diff --git a/media/libstagefright/StagefrightMetadataRetriever.cpp b/media/libstagefright/StagefrightMetadataRetriever.cpp
index 7c554db..e37e909 100644
--- a/media/libstagefright/StagefrightMetadataRetriever.cpp
+++ b/media/libstagefright/StagefrightMetadataRetriever.cpp
@@ -146,7 +146,10 @@
     sp<MetaData> format = source->getFormat();
 
     sp<AMessage> videoFormat;
-    convertMetaDataToMessage(trackMeta, &videoFormat);
+    if (convertMetaDataToMessage(trackMeta, &videoFormat) != OK) {
+        ALOGW("Failed to convert meta data to message");
+        return NULL;
+    }
 
     // TODO: Use Flexible color instead
     videoFormat->setInt32("color-format", OMX_COLOR_FormatYUV420Planar);