commit bb62819aa34b0e89090ccc50e5915e25bc137583
author Andreas Huber <andih@google.com> Tue Jan 31 08:31:03 2012 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jan 31 08:31:03 2012 -0800
tree 17261fdb4651dda30761b94ef24045a522f75ee1
parent e59542680aa0e83cacbc471fbd3945b0509a849c
parent 530f752a8191ccc6bde82fb2012aa3cd032257c0

Merge "Make sure our aac decoder handles this parameter."

media/libstagefright/codecs/aacdec/SoftAAC.cpp

diff --git a/media/libstagefright/codecs/aacdec/SoftAAC.cpp b/media/libstagefright/codecs/aacdec/SoftAAC.cpp
index da9d280..ea6c360 100644
--- a/media/libstagefright/codecs/aacdec/SoftAAC.cpp
+++ b/media/libstagefright/codecs/aacdec/SoftAAC.cpp
@@ -218,6 +218,18 @@
             return OMX_ErrorNone;
         }
 
+        case OMX_IndexParamAudioPcm:
+        {
+            const OMX_AUDIO_PARAM_PCMMODETYPE *pcmParams =
+                (OMX_AUDIO_PARAM_PCMMODETYPE *)params;
+
+            if (pcmParams->nPortIndex != 1) {
+                return OMX_ErrorUndefined;
+            }
+
+            return OMX_ErrorNone;
+        }
+
         default:
             return SimpleSoftOMXComponent::internalSetParameter(index, params);
     }