commit 1ebba96a971c161780f2d65fed01b46bacb331d0
author Dave Burke <daveburke@google.com> Tue May 15 20:32:55 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Tue May 15 20:32:55 2012 -0700
tree e3051006527660398c43b1c6eb00c8a39850cf9b
parent 8526f4b742c7fbc2dd068b20e9a2b262a0746bfe
parent 7d2256a535434d4f05a57eebc592790a1d1edd90

am 7d2256a5: am 62999949: Merge "Add logging for invalid channel count or sample rate." into jb-dev

* commit '7d2256a535434d4f05a57eebc592790a1d1edd90':
  Add logging for invalid channel count or sample rate.

media/libstagefright/codecs/aacdec/SoftAAC2.cpp

diff --git a/media/libstagefright/codecs/aacdec/SoftAAC2.cpp b/media/libstagefright/codecs/aacdec/SoftAAC2.cpp
index 58ad065..b0d305b 100644
--- a/media/libstagefright/codecs/aacdec/SoftAAC2.cpp
+++ b/media/libstagefright/codecs/aacdec/SoftAAC2.cpp
@@ -179,6 +179,9 @@
                 pcmParams->nSamplingRate = mStreamInfo->sampleRate;
             }
 
+            if (!pcmParams->nChannels) ALOGW("Audio contains 0 channels");
+            if (!pcmParams->nSamplingRate) ALOGW("Sampling rate of 0 Hz");
+
             return OMX_ErrorNone;
         }