disable verbose log

diff --git a/libstagefright/FFmpegExtractor/FFmpegExtractor.cpp b/libstagefright/FFmpegExtractor/FFmpegExtractor.cpp
index af5ddb4..cd6f851 100644 (file)
--- a/libstagefright/FFmpegExtractor/FFmpegExtractor.cpp
+++ b/libstagefright/FFmpegExtractor/FFmpegExtractor.cpp
@@ -14,7 +14,6 @@
  * limitations under the License.
  */
 
-#define LOG_NDEBUG 0
 #define LOG_TAG "FFmpegExtractor"
 #include <utils/Log.h>
 
@@ -57,6 +56,7 @@
 #define DEBUG_DISABLE_AUDIO        0
 #define WAIT_KEY_PACKET_AFTER_SEEK 1
 #define DEBUG_PKT                  0
+#define DEBUG_EXTRADATA            0
 
 enum {
     NO_SEEK = 0,
@@ -572,14 +572,14 @@ int FFmpegExtractor::stream_component_open(int stream_index)
             }
             return ret;
          }
-
+#if DEBUG_EXTRADATA
         if (avctx->extradata) {
             ALOGV("video stream extradata:");
             hexdump(avctx->extradata, avctx->extradata_size);
         } else {
             ALOGV("video stream no extradata, but we can ignore it.");
         }
-
+#endif
         meta = setVideoFormat(mVideoStream);
         if (meta == NULL) {
             ALOGE("setVideoFormat failed");
@@ -610,14 +610,14 @@ int FFmpegExtractor::stream_component_open(int stream_index)
             }
             return ret;
         }
-
+#if DEBUG_EXTRADATA
         if (avctx->extradata) {
             ALOGV("audio stream extradata(%d):", avctx->extradata_size);
             hexdump(avctx->extradata, avctx->extradata_size);
         } else {
             ALOGV("audio stream no extradata, but we can ignore it.");
         }
-
+#endif
         meta = setAudioFormat(mAudioStream);
         if (meta == NULL) {
             ALOGE("setAudioFormat failed");

diff --git a/libstagefright/NamExtractor.cpp b/libstagefright/NamExtractor.cpp
index 2b8b697..65b2ccf 100755 (executable)
--- a/libstagefright/NamExtractor.cpp
+++ b/libstagefright/NamExtractor.cpp
@@ -14,7 +14,6 @@
  * limitations under the License.
  */
 
-#define LOG_NDEBUG 0
 #define LOG_TAG "NamExtractor"
 #include <utils/Log.h>
 

diff --git a/libstagefright/codecs/ffmpegdec/adec/SoftFFmpegAudio.cpp b/libstagefright/codecs/ffmpegdec/adec/SoftFFmpegAudio.cpp
index 82650dc..d518691 100644 (file)
--- a/libstagefright/codecs/ffmpegdec/adec/SoftFFmpegAudio.cpp
+++ b/libstagefright/codecs/ffmpegdec/adec/SoftFFmpegAudio.cpp
@@ -14,7 +14,6 @@
  * limitations under the License.
  */
 
-#define LOG_NDEBUG 0
 #define LOG_TAG "SoftFFmpegAudio"
 #include <utils/Log.h>
 
@@ -26,6 +25,7 @@
 
 #define DEBUG_PKT 0
 #define DEBUG_FRM 0
+#define DEBUG_EXTRADATA 0
 
 namespace android {
 
@@ -1064,11 +1064,11 @@ int32_t SoftFFmpegAudio::handleExtradata() {
     List<BufferInfo *> &inQueue = getPortQueue(kInputPortIndex);
     BufferInfo *inInfo = *inQueue.begin();
     OMX_BUFFERHEADERTYPE *inHeader = inInfo->mHeader;
-
+#if DEBUG_EXTRADATA
     ALOGI("got extradata, ignore: %d, size: %lu",
             mIgnoreExtradata, inHeader->nFilledLen);
     hexdump(inHeader->pBuffer + inHeader->nOffset, inHeader->nFilledLen);
-
+#endif
     if (mIgnoreExtradata) {
         ALOGI("got extradata, size: %lu, but ignore it", inHeader->nFilledLen);
     } else {
@@ -1120,8 +1120,10 @@ int32_t SoftFFmpegAudio::openDecoder() {
             }
             deinitVorbisHdr();
            }
+#if DEBUG_EXTRADATA
         ALOGI("extradata is ready, size: %d", mCtx->extradata_size);
         hexdump(mCtx->extradata, mCtx->extradata_size);
+#endif
         mExtradataReady = true;
     }
 

diff --git a/libstagefright/codecs/ffmpegdec/vdec/SoftFFmpegVideo.cpp b/libstagefright/codecs/ffmpegdec/vdec/SoftFFmpegVideo.cpp
index 7bf6c75..92b904d 100644 (file)
--- a/libstagefright/codecs/ffmpegdec/vdec/SoftFFmpegVideo.cpp
+++ b/libstagefright/codecs/ffmpegdec/vdec/SoftFFmpegVideo.cpp
@@ -14,7 +14,6 @@
  * limitations under the License.
  */
 
-#define LOG_NDEBUG 0
 #define LOG_TAG "SoftFFmpegVideo"
 #include <utils/Log.h>
 
@@ -26,6 +25,7 @@
 
 #define DEBUG_PKT 0
 #define DEBUG_FRM 0
+#define DEBUG_EXTRADATA 0
 
 static int decoder_reorder_pts = -1;
 
@@ -718,11 +718,11 @@ int32_t SoftFFmpegVideo::handleExtradata() {
     List<BufferInfo *> &inQueue = getPortQueue(kInputPortIndex);
     BufferInfo *inInfo = *inQueue.begin();
     OMX_BUFFERHEADERTYPE *inHeader = inInfo->mHeader;
-
+#if DEBUG_EXTRADATA
     ALOGI("got extradata, ignore: %d, size: %lu",
             mIgnoreExtradata, inHeader->nFilledLen);
     hexdump(inHeader->pBuffer + inHeader->nOffset, inHeader->nFilledLen);
-
+#endif
     if (mIgnoreExtradata) {
         ALOGI("got extradata, size: %lu, but ignore it", inHeader->nFilledLen);
        } else {
@@ -760,8 +760,10 @@ int32_t SoftFFmpegVideo::openDecoder() {
     }
 
     if (!mExtradataReady) {
+#if DEBUG_EXTRADATA
         ALOGI("extradata is ready, size: %d", mCtx->extradata_size);
         hexdump(mCtx->extradata, mCtx->extradata_size);
+#endif
         mExtradataReady = true;
     }
 

diff --git a/utils/codec_utils.cpp b/utils/codec_utils.cpp
index cc6a343..14cc856 100644 (file)
--- a/utils/codec_utils.cpp
+++ b/utils/codec_utils.cpp
@@ -14,7 +14,6 @@
  * limitations under the License.
  */
 
-#define LOG_NDEBUG 0
 #define LOG_TAG "codec_utils"
 #include <utils/Log.h>
 

diff --git a/utils/ffmpeg_source.cpp b/utils/ffmpeg_source.cpp
index 9199194..c221333 100644 (file)
--- a/utils/ffmpeg_source.cpp
+++ b/utils/ffmpeg_source.cpp
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#define LOG_NDEBUG 0
+
 #define LOG_TAG "FFMPEG"
 #include <utils/Log.h>
 

diff --git a/utils/ffmpeg_utils.cpp b/utils/ffmpeg_utils.cpp
index 4ba2af7..bb5f680 100644 (file)
--- a/utils/ffmpeg_utils.cpp
+++ b/utils/ffmpeg_utils.cpp
@@ -14,7 +14,6 @@
  * limitations under the License.
  */
 
-#define LOG_NDEBUG 0
 #define LOG_TAG "FFMPEG"
 #include <utils/Log.h>