X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=extractor%2FFFmpegExtractor.cpp;h=63deb51c32d2c448bb90d63155e18a4f2008784e;hb=797e00145e8f442129fcf044c23db9af08e40b12;hp=937ccc75079a15715326fa3e6892c423c871a9b4;hpb=09d72f4acc3ddfbb62eb52ad567f5632194be723;p=android-x86%2Fexternal-stagefright-plugins.git diff --git a/extractor/FFmpegExtractor.cpp b/extractor/FFmpegExtractor.cpp index 937ccc7..63deb51 100644 --- a/extractor/FFmpegExtractor.cpp +++ b/extractor/FFmpegExtractor.cpp @@ -15,7 +15,6 @@ * limitations under the License. */ -//#define LOG_NDEBUG 0 #define LOG_TAG "FFmpegExtractor" #include @@ -61,6 +60,7 @@ #define DEBUG_DISABLE_VIDEO 0 #define DEBUG_DISABLE_AUDIO 0 #define DEBUG_PKT 0 +#define DEBUG_EXTRADATA 0 #define DEBUG_FORMATS 0 enum { @@ -654,14 +654,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"); @@ -696,14 +696,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");