stagefright: Fix CTS failures

Change-Id: Ibe30029409667912ff150df47e3be8dd2956844b

2 files changed, 11 insertions, 14 deletions

diff --git a/media/libstagefright/ExtendedCodec.cpp b/media/libstagefright/ExtendedCodec.cpp
index eb56608a35..15cf12f59b 100644
--- a/media/libstagefright/ExtendedCodec.cpp
+++ b/media/libstagefright/ExtendedCodec.cpp
@@ -327,7 +327,7 @@ status_t ExtendedCodec::setAudioFormat(
         const sp<AMessage> &msg, const char* mime, sp<IOMX> OMXhandle,
         IOMX::node_id nodeID, bool isEncoder ) {
     ALOGV("setAudioFormat called");
-    status_t err = ERROR_UNSUPPORTED;
+    status_t err = OK;
 
     if ((!strcasecmp(MEDIA_MIMETYPE_AUDIO_AC3, mime)) ||
         (!strcasecmp(MEDIA_MIMETYPE_AUDIO_EAC3, mime))){
@@ -337,19 +337,16 @@ status_t ExtendedCodec::setAudioFormat(
         //setAC3Format(numChannels, sampleRate, OMXhandle, nodeID);
         CHECK(msg->findInt32("channel-count", &numChannels));
         CHECK(msg->findInt32("sample-rate", &sampleRate));
-        err = OK;
     } else if (!strcasecmp(MEDIA_MIMETYPE_AUDIO_EVRC, mime)) {
         int32_t numChannels, sampleRate;
         CHECK(msg->findInt32("channel-count", &numChannels));
         CHECK(msg->findInt32("sample-rate", &sampleRate));
         setEVRCFormat(numChannels, sampleRate, OMXhandle, nodeID, isEncoder );
-        err = OK;
     } else if (!strcasecmp(MEDIA_MIMETYPE_AUDIO_QCELP, mime)) {
         int32_t numChannels, sampleRate;
         CHECK(msg->findInt32("channel-count", &numChannels));
         CHECK(msg->findInt32("sample-rate", &sampleRate));
         setQCELPFormat(numChannels, sampleRate, OMXhandle, nodeID, isEncoder);
-        err = OK;
     } else if (!strcasecmp(MEDIA_MIMETYPE_AUDIO_WMA, mime))  {
         err = setWMAFormat(msg, OMXhandle, nodeID, isEncoder);
     } else if (!strcasecmp(MEDIA_MIMETYPE_AUDIO_AMR_WB_PLUS, mime)) {
diff --git a/media/libstagefright/OMXCodec.cpp b/media/libstagefright/OMXCodec.cpp
index f6584b907e..71f6f8d7b4 100644
--- a/media/libstagefright/OMXCodec.cpp
+++ b/media/libstagefright/OMXCodec.cpp
@@ -892,17 +892,17 @@ status_t OMXCodec::configureCodec(const sp<MetaData> &meta) {
             }
         }
 #ifdef QCOM_HARDWARE
-    } else if (!strncmp(mComponentName, "OMX.qcom.", 9)) {
-        if (!mIsVideo) {
-            if (mIsEncoder) {
-                int32_t numChannels, sampleRate;
-                CHECK(meta->findInt32(kKeyChannelCount, &numChannels));
-                CHECK(meta->findInt32(kKeySampleRate, &sampleRate));
-                setRawAudioFormat(kPortIndexInput, sampleRate, numChannels);
-            }
+    } else {
+        if (!mIsVideo && mIsEncoder) {
+            int32_t numChannels, sampleRate;
+            CHECK(meta->findInt32(kKeyChannelCount, &numChannels));
+            CHECK(meta->findInt32(kKeySampleRate, &sampleRate));
+            setRawAudioFormat(kPortIndexInput, sampleRate, numChannels);
+        }
+        if (!strncmp(mComponentName, "OMX.qcom.", 9)) {
             status_t err = ExtendedCodec::setAudioFormat(
-                    meta, mMIME, mOMX, mNode, mIsEncoder);
-            if(OK != err) {
+                   meta, mMIME, mOMX, mNode, mIsEncoder);
+            if (OK != err) {
                 return err;
             }
         }