ffmpeg | branch: master | foo86 <fooba...@gmail.com> | Mon Dec 7 18:48:13 2015 +0300| [704b278361add7c819b4c3725938c4424328e268] | committer: Michael Niedermayer
avcodec/libdcadec: implement logging callback Don't print a warning when dcadec_context_filter() returns positive warning code. Most relevant warnings are now output through the callback function. Signed-off-by: Michael Niedermayer <mich...@niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=704b278361add7c819b4c3725938c4424328e268 --- libavcodec/libdcadec.c | 31 +++++++++++++++++++++++++++++-- 1 file changed, 29 insertions(+), 2 deletions(-) diff --git a/libavcodec/libdcadec.c b/libavcodec/libdcadec.c index 6166c9d..e15d1b5 100644 --- a/libavcodec/libdcadec.c +++ b/libavcodec/libdcadec.c @@ -36,6 +36,33 @@ typedef struct DCADecContext { int buffer_size; } DCADecContext; +static void my_log_cb(int level, const char *file, int line, + const char *message, void *cbarg) +{ + int av_level; + + switch (level) { + case DCADEC_LOG_ERROR: + av_level = AV_LOG_ERROR; + break; + case DCADEC_LOG_WARNING: + av_level = AV_LOG_WARNING; + break; + case DCADEC_LOG_INFO: + av_level = AV_LOG_INFO; + break; + case DCADEC_LOG_VERBOSE: + av_level = AV_LOG_VERBOSE; + break; + case DCADEC_LOG_DEBUG: + default: + av_level = AV_LOG_DEBUG; + break; + } + + av_log(cbarg, av_level, "%s\n", message); +} + static int dcadec_decode_frame(AVCodecContext *avctx, void *data, int *got_frame_ptr, AVPacket *avpkt) { @@ -77,8 +104,6 @@ static int dcadec_decode_frame(AVCodecContext *avctx, void *data, &sample_rate, &bits_per_sample, &profile)) < 0) { av_log(avctx, AV_LOG_ERROR, "dcadec_context_filter() failed: %d (%s)\n", -ret, dcadec_strerror(ret)); return AVERROR_EXTERNAL; - } else if (ret > 0) { - av_log(avctx, AV_LOG_WARNING, "dcadec_context_filter() warning: %d (%s)\n", ret, dcadec_strerror(ret)); } avctx->channels = av_get_channel_layout_nb_channels(channel_mask); @@ -219,6 +244,8 @@ static av_cold int dcadec_init(AVCodecContext *avctx) if (!s->ctx) return AVERROR(ENOMEM); + dcadec_context_set_log_cb(s->ctx, my_log_cb, avctx); + avctx->sample_fmt = AV_SAMPLE_FMT_S32P; avctx->bits_per_raw_sample = 24; _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
