commit 69bebe8d87e95a026d14f0a7cd68d8f954dc51c8
author Lajos Molnar <lajos@google.com> Wed Feb 10 15:32:46 2016 -0800
committer Lajos Molnar <lajos@google.com> Thu Feb 11 00:02:40 2016 +0000
tree 43b8ac1dcc367928416d5815e742b84a3cdb6f14
parent 4ad74b2b4507c8b2714b7b7584578d2d43ae2633

MediaCodecInfo: keep capabilities from XML when updating them from codec

Bug: 27115490
Change-Id: Ie15bf538a3026829ff8029fb8b96b8d254517d1c

media/libmedia/MediaCodecInfo.cpp

diff --git a/media/libmedia/MediaCodecInfo.cpp b/media/libmedia/MediaCodecInfo.cpp
index 3b53f4c..8351af6 100644
--- a/media/libmedia/MediaCodecInfo.cpp
+++ b/media/libmedia/MediaCodecInfo.cpp
@@ -238,7 +238,11 @@
     }
 }
 
-status_t MediaCodecInfo::setCapabilities(const sp<Capabilities> &caps) {
+status_t MediaCodecInfo::setCapabilitiesFromCodec(const sp<Capabilities> &caps) {
+    if (mCurrentCaps != NULL) {
+        // keep current capabilities map
+        caps->mDetails = mCurrentCaps->mDetails;
+    }
     mCurrentCaps = caps;
     return OK;
 }

media/libstagefright/MediaCodecList.cpp

diff --git a/media/libstagefright/MediaCodecList.cpp b/media/libstagefright/MediaCodecList.cpp
index 34d85e7..200796c 100644
--- a/media/libstagefright/MediaCodecList.cpp
+++ b/media/libstagefright/MediaCodecList.cpp
@@ -767,7 +767,7 @@
         return UNKNOWN_ERROR;
     }
 
-    return mCurrentInfo->setCapabilities(caps);
+    return mCurrentInfo->setCapabilitiesFromCodec(caps);
 }
 
 status_t MediaCodecList::addQuirk(const char **attrs) {