From d27a12cb0982921e503e68692bb99b6dfe1a6144 Mon Sep 17 00:00:00 2001 From: wm4 Date: Thu, 28 Jan 2016 17:23:46 +0100 Subject: mmaldec: print the MMAL format FourCC automatically Slight simplification. The result is the same. Also, change the wording of the message as requested in patch review. --- libavcodec/mmaldec.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'libavcodec/mmaldec.c') diff --git a/libavcodec/mmaldec.c b/libavcodec/mmaldec.c index 281071cc80..16e98ad161 100644 --- a/libavcodec/mmaldec.c +++ b/libavcodec/mmaldec.c @@ -332,6 +332,7 @@ static av_cold int ffmmal_init_decoder(AVCodecContext *avctx) MMAL_STATUS_T status; MMAL_ES_FORMAT_T *format_in; MMAL_COMPONENT_T *decoder; + char tmp[32]; int ret = 0; bcm_host_init(); @@ -356,16 +357,13 @@ static av_cold int ffmmal_init_decoder(AVCodecContext *avctx) switch (avctx->codec_id) { case AV_CODEC_ID_MPEG2VIDEO: format_in->encoding = MMAL_ENCODING_MP2V; - av_log(avctx, AV_LOG_DEBUG, "Use MMAL MP2V encoding\n"); break; case AV_CODEC_ID_VC1: format_in->encoding = MMAL_ENCODING_WVC1; - av_log(avctx, AV_LOG_DEBUG, "Use MMAL WVC1 encoding\n"); break; case AV_CODEC_ID_H264: default: format_in->encoding = MMAL_ENCODING_H264; - av_log(avctx, AV_LOG_DEBUG, "Use MMAL H264 encoding\n"); break; } format_in->es->video.width = FFALIGN(avctx->width, 32); @@ -378,6 +376,9 @@ static av_cold int ffmmal_init_decoder(AVCodecContext *avctx) format_in->es->video.par.den = avctx->sample_aspect_ratio.den; format_in->flags = MMAL_ES_FORMAT_FLAG_FRAMED; + av_get_codec_tag_string(tmp, sizeof(tmp), format_in->encoding); + av_log(avctx, AV_LOG_DEBUG, "Using MMAL %s encoding.\n", tmp); + if ((status = mmal_port_format_commit(decoder->input[0]))) goto fail; -- cgit v1.2.3