commit 9d1e267c831b21dcfd380ce36de0e5837f94aab3
author Eino-Ville Talvala <etalvala@google.com> Wed May 30 13:39:00 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Wed May 30 13:39:00 2012 -0700
tree 3ce090a7d0151b76e1b82214617cea58b56d5efc
parent da4cb00ea329ac6d15d33ec67e85d76fed3154fa
parent f69c70ded4316ea3ee504ac779bd024433ed4ef7

Merge "Camera service: Initialization for camera2 clients and devices"

media/libstagefright/OMXCodec.cpp

diff --git a/media/libstagefright/OMXCodec.cpp b/media/libstagefright/OMXCodec.cpp
index 7fb395e..baabd37 100755
--- a/media/libstagefright/OMXCodec.cpp
+++ b/media/libstagefright/OMXCodec.cpp
@@ -3648,7 +3648,7 @@
 }
 
 status_t OMXCodec::stop() {
-    CODEC_LOGV("stop mState=%d", mState);
+    CODEC_LOGI("stop mState=%d", mState);
 
     Mutex::Autolock autoLock(mLock);
 
@@ -3748,9 +3748,10 @@
         mLeftOverBuffer = NULL;
     }
 
+    CODEC_LOGI("stopping in state %d", mState);
     mSource->stop();
 
-    CODEC_LOGV("stopped in state %d", mState);
+    CODEC_LOGI("stopped in state %d", mState);
 
     return OK;
 }

media/libstagefright/codecs/aacdec/SoftAAC2.cpp

diff --git a/media/libstagefright/codecs/aacdec/SoftAAC2.cpp b/media/libstagefright/codecs/aacdec/SoftAAC2.cpp
index 791445c..8dbff9e 100644
--- a/media/libstagefright/codecs/aacdec/SoftAAC2.cpp
+++ b/media/libstagefright/codecs/aacdec/SoftAAC2.cpp
@@ -416,6 +416,9 @@
                                                 outHeader->nAllocLen,
                                                 0 /* flags */);
 
+            if (decoderErr == AAC_DEC_NOT_ENOUGH_BITS) {
+                ALOGW("Not enough bits, bytesValid %d", bytesValid[0]);
+            }
         }
 
         /*