From 23426987fa206833e48f22aa7c80d038c836a196 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Reimar=20D=C3=B6ffinger?= Date: Sun, 24 Feb 2013 17:21:53 +0100 Subject: [PATCH] mpeg12: reduce hwaccel-related code duplication. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Reimar Döffinger --- libavcodec/mpeg12.c | 37 ++++++++++++++++++------------------- 1 file changed, 18 insertions(+), 19 deletions(-) diff --git a/libavcodec/mpeg12.c b/libavcodec/mpeg12.c index 7171ecafc3..4a83cfd531 100644 --- a/libavcodec/mpeg12.c +++ b/libavcodec/mpeg12.c @@ -1237,23 +1237,31 @@ static enum AVPixelFormat mpeg_get_pixelformat(AVCodecContext *avctx) MpegEncContext *s = &s1->mpeg_enc_ctx; if(s->chroma_format < 2) { - enum AVPixelFormat res; - res = avctx->get_format(avctx, + return avctx->get_format(avctx, avctx->codec_id == AV_CODEC_ID_MPEG1VIDEO ? mpeg1_hwaccel_pixfmt_list_420 : mpeg2_hwaccel_pixfmt_list_420); - if (res != AV_PIX_FMT_XVMC_MPEG2_IDCT && res != AV_PIX_FMT_XVMC_MPEG2_MC) { - avctx->xvmc_acceleration = 0; - } else if (!avctx->xvmc_acceleration) { - avctx->xvmc_acceleration = 2; - } - return res; } else if(s->chroma_format == 2) return AV_PIX_FMT_YUV422P; else return AV_PIX_FMT_YUV444P; } +static void setup_hwaccel_for_pixfmt(AVCodecContext *avctx) +{ + if (avctx->pix_fmt != AV_PIX_FMT_XVMC_MPEG2_IDCT && avctx->pix_fmt != AV_PIX_FMT_XVMC_MPEG2_MC) { + avctx->xvmc_acceleration = 0; + } else if (!avctx->xvmc_acceleration) { + avctx->xvmc_acceleration = 2; + } + avctx->hwaccel = ff_find_hwaccel(avctx->codec->id, avctx->pix_fmt); + // until then pix_fmt may be changed right after codec init + if (avctx->pix_fmt == AV_PIX_FMT_XVMC_MPEG2_IDCT || + avctx->hwaccel || uses_vdpau(avctx)) + if (avctx->idct_algo == FF_IDCT_AUTO) + avctx->idct_algo = FF_IDCT_SIMPLE; +} + /* Call this function when we know all parameters. * It may be called in different places for MPEG-1 and MPEG-2. */ static int mpeg_decode_postinit(AVCodecContext *avctx) @@ -1348,12 +1356,7 @@ static int mpeg_decode_postinit(AVCodecContext *avctx) } // MPEG-2 avctx->pix_fmt = mpeg_get_pixelformat(avctx); - avctx->hwaccel = ff_find_hwaccel(avctx->codec->id, avctx->pix_fmt); - // until then pix_fmt may be changed right after codec init - if (avctx->pix_fmt == AV_PIX_FMT_XVMC_MPEG2_IDCT || - avctx->hwaccel || uses_vdpau(avctx)) - if (avctx->idct_algo == FF_IDCT_AUTO) - avctx->idct_algo = FF_IDCT_SIMPLE; + setup_hwaccel_for_pixfmt(avctx); /* Quantization matrices may need reordering * if DCT permutation is changed. */ @@ -2105,11 +2108,7 @@ static int vcr2_init_sequence(AVCodecContext *avctx) s->low_delay = 1; avctx->pix_fmt = mpeg_get_pixelformat(avctx); - avctx->hwaccel = ff_find_hwaccel(avctx->codec->id, avctx->pix_fmt); - - if (avctx->pix_fmt == AV_PIX_FMT_XVMC_MPEG2_IDCT || avctx->hwaccel || uses_vdpau(avctx)) - if (avctx->idct_algo == FF_IDCT_AUTO) - avctx->idct_algo = FF_IDCT_SIMPLE; + setup_hwaccel_for_pixfmt(avctx); if (ff_MPV_common_init(s) < 0) return -1;