commit b4b5d529dca327ae93e26a8bc0cb54cadf6bb354
author Ronghua Wu <ronghuawu@google.com> Fri Sep 11 03:50:49 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Sep 11 03:50:49 2015 +0000
tree 2e4b0a117f0b162fe383a8e4f844cdd36c255611
parent c06f0ef67f02f88e01e2b2679e83c87628dbfc1a
parent c5c0e4ec73d25543693e4902c19f239671ede94b

am c5c0e4ec: am 885dedb4: am ad26bbdd: Merge "libstagefright: Do not add audio codecs to resource manager. They are too small anyhow." into mnc-dr-dev

* commit 'c5c0e4ec73d25543693e4902c19f239671ede94b':
  libstagefright: Do not add audio codecs to resource manager. They are too small anyhow.

media/libstagefright/MediaCodec.cpp

diff --git a/media/libstagefright/MediaCodec.cpp b/media/libstagefright/MediaCodec.cpp
index ec758d5..9085ed7 100644
--- a/media/libstagefright/MediaCodec.cpp
+++ b/media/libstagefright/MediaCodec.cpp
@@ -572,6 +572,7 @@
 }
 
 status_t MediaCodec::reclaim() {
+    ALOGD("MediaCodec::reclaim(%p) %s", this, mInitName.c_str());
     sp<AMessage> msg = new AMessage(kWhatRelease, this);
     msg->setInt32("reclaimed", 1);
 
@@ -1175,8 +1176,10 @@
                         resourceType = String8(kResourceNonSecureCodec);
                     }
 
-                    const char *subtype = mIsVideo ? kResourceVideoCodec : kResourceAudioCodec;
-                    addResource(resourceType, String8(subtype), 1);
+                    if (mIsVideo) {
+                        // audio codec is currently ignored.
+                        addResource(resourceType, String8(kResourceVideoCodec), 1);
+                    }
 
                     (new AMessage)->postReply(mReplyID);
                     break;