Android-x86
Fork
Donation

  • R/O
  • HTTP
  • SSH
  • HTTPS

external-stagefright-plugins: Commit

external/stagefright-plugins


Commit MetaInfo

Revision8f1521a5fa9a8f1ffe9d82a53dba8f91ad5672ed (tree)
Time2014-06-05 11:47:52
AuthorChih-Wei Huang <cwhuang@linu...>
CommiterChih-Wei Huang

Log Message

disable verbose log

Change Summary

Incremental Difference

--- a/libstagefright/FFmpegExtractor/FFmpegExtractor.cpp
+++ b/libstagefright/FFmpegExtractor/FFmpegExtractor.cpp
@@ -14,7 +14,6 @@
1414 * limitations under the License.
1515 */
1616
17-#define LOG_NDEBUG 0
1817 #define LOG_TAG "FFmpegExtractor"
1918 #include <utils/Log.h>
2019
@@ -57,6 +56,7 @@
5756 #define DEBUG_DISABLE_AUDIO 0
5857 #define WAIT_KEY_PACKET_AFTER_SEEK 1
5958 #define DEBUG_PKT 0
59+#define DEBUG_EXTRADATA 0
6060
6161 enum {
6262 NO_SEEK = 0,
@@ -572,14 +572,14 @@ int FFmpegExtractor::stream_component_open(int stream_index)
572572 }
573573 return ret;
574574 }
575-
575+#if DEBUG_EXTRADATA
576576 if (avctx->extradata) {
577577 ALOGV("video stream extradata:");
578578 hexdump(avctx->extradata, avctx->extradata_size);
579579 } else {
580580 ALOGV("video stream no extradata, but we can ignore it.");
581581 }
582-
582+#endif
583583 meta = setVideoFormat(mVideoStream);
584584 if (meta == NULL) {
585585 ALOGE("setVideoFormat failed");
@@ -610,14 +610,14 @@ int FFmpegExtractor::stream_component_open(int stream_index)
610610 }
611611 return ret;
612612 }
613-
613+#if DEBUG_EXTRADATA
614614 if (avctx->extradata) {
615615 ALOGV("audio stream extradata(%d):", avctx->extradata_size);
616616 hexdump(avctx->extradata, avctx->extradata_size);
617617 } else {
618618 ALOGV("audio stream no extradata, but we can ignore it.");
619619 }
620-
620+#endif
621621 meta = setAudioFormat(mAudioStream);
622622 if (meta == NULL) {
623623 ALOGE("setAudioFormat failed");
--- a/libstagefright/NamExtractor.cpp
+++ b/libstagefright/NamExtractor.cpp
@@ -14,7 +14,6 @@
1414 * limitations under the License.
1515 */
1616
17-#define LOG_NDEBUG 0
1817 #define LOG_TAG "NamExtractor"
1918 #include <utils/Log.h>
2019
--- a/libstagefright/codecs/ffmpegdec/adec/SoftFFmpegAudio.cpp
+++ b/libstagefright/codecs/ffmpegdec/adec/SoftFFmpegAudio.cpp
@@ -14,7 +14,6 @@
1414 * limitations under the License.
1515 */
1616
17-#define LOG_NDEBUG 0
1817 #define LOG_TAG "SoftFFmpegAudio"
1918 #include <utils/Log.h>
2019
@@ -26,6 +25,7 @@
2625
2726 #define DEBUG_PKT 0
2827 #define DEBUG_FRM 0
28+#define DEBUG_EXTRADATA 0
2929
3030 namespace android {
3131
@@ -1064,11 +1064,11 @@ int32_t SoftFFmpegAudio::handleExtradata() {
10641064 List<BufferInfo *> &inQueue = getPortQueue(kInputPortIndex);
10651065 BufferInfo *inInfo = *inQueue.begin();
10661066 OMX_BUFFERHEADERTYPE *inHeader = inInfo->mHeader;
1067-
1067+#if DEBUG_EXTRADATA
10681068 ALOGI("got extradata, ignore: %d, size: %lu",
10691069 mIgnoreExtradata, inHeader->nFilledLen);
10701070 hexdump(inHeader->pBuffer + inHeader->nOffset, inHeader->nFilledLen);
1071-
1071+#endif
10721072 if (mIgnoreExtradata) {
10731073 ALOGI("got extradata, size: %lu, but ignore it", inHeader->nFilledLen);
10741074 } else {
@@ -1120,8 +1120,10 @@ int32_t SoftFFmpegAudio::openDecoder() {
11201120 }
11211121 deinitVorbisHdr();
11221122 }
1123+#if DEBUG_EXTRADATA
11231124 ALOGI("extradata is ready, size: %d", mCtx->extradata_size);
11241125 hexdump(mCtx->extradata, mCtx->extradata_size);
1126+#endif
11251127 mExtradataReady = true;
11261128 }
11271129
--- a/libstagefright/codecs/ffmpegdec/vdec/SoftFFmpegVideo.cpp
+++ b/libstagefright/codecs/ffmpegdec/vdec/SoftFFmpegVideo.cpp
@@ -14,7 +14,6 @@
1414 * limitations under the License.
1515 */
1616
17-#define LOG_NDEBUG 0
1817 #define LOG_TAG "SoftFFmpegVideo"
1918 #include <utils/Log.h>
2019
@@ -26,6 +25,7 @@
2625
2726 #define DEBUG_PKT 0
2827 #define DEBUG_FRM 0
28+#define DEBUG_EXTRADATA 0
2929
3030 static int decoder_reorder_pts = -1;
3131
@@ -718,11 +718,11 @@ int32_t SoftFFmpegVideo::handleExtradata() {
718718 List<BufferInfo *> &inQueue = getPortQueue(kInputPortIndex);
719719 BufferInfo *inInfo = *inQueue.begin();
720720 OMX_BUFFERHEADERTYPE *inHeader = inInfo->mHeader;
721-
721+#if DEBUG_EXTRADATA
722722 ALOGI("got extradata, ignore: %d, size: %lu",
723723 mIgnoreExtradata, inHeader->nFilledLen);
724724 hexdump(inHeader->pBuffer + inHeader->nOffset, inHeader->nFilledLen);
725-
725+#endif
726726 if (mIgnoreExtradata) {
727727 ALOGI("got extradata, size: %lu, but ignore it", inHeader->nFilledLen);
728728 } else {
@@ -760,8 +760,10 @@ int32_t SoftFFmpegVideo::openDecoder() {
760760 }
761761
762762 if (!mExtradataReady) {
763+#if DEBUG_EXTRADATA
763764 ALOGI("extradata is ready, size: %d", mCtx->extradata_size);
764765 hexdump(mCtx->extradata, mCtx->extradata_size);
766+#endif
765767 mExtradataReady = true;
766768 }
767769
--- a/utils/codec_utils.cpp
+++ b/utils/codec_utils.cpp
@@ -14,7 +14,6 @@
1414 * limitations under the License.
1515 */
1616
17-#define LOG_NDEBUG 0
1817 #define LOG_TAG "codec_utils"
1918 #include <utils/Log.h>
2019
--- a/utils/ffmpeg_source.cpp
+++ b/utils/ffmpeg_source.cpp
@@ -13,7 +13,7 @@
1313 * See the License for the specific language governing permissions and
1414 * limitations under the License.
1515 */
16-#define LOG_NDEBUG 0
16+
1717 #define LOG_TAG "FFMPEG"
1818 #include <utils/Log.h>
1919
--- a/utils/ffmpeg_utils.cpp
+++ b/utils/ffmpeg_utils.cpp
@@ -14,7 +14,6 @@
1414 * limitations under the License.
1515 */
1616
17-#define LOG_NDEBUG 0
1817 #define LOG_TAG "FFMPEG"
1918 #include <utils/Log.h>
2019
Show on old repository browser