From eab21c32e34d8dc45e915c597cf974f31a95c207 Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Mon, 22 Aug 2011 07:55:34 +0200 Subject: [PATCH] libx264: add 'mixed-refs' private option. Deprecate CODEC_FLAG2_MIXED_REFS. --- libavcodec/avcodec.h | 2 +- libavcodec/libx264.c | 7 +++++-- libavcodec/options.c | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 3b669ceb1f572..c7c8583ac1dbc 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -610,8 +610,8 @@ typedef struct RcOverride{ #if FF_API_X264_GLOBAL_OPTS #define CODEC_FLAG2_BPYRAMID 0x00000010 ///< H.264 allow B-frames to be used as references. #define CODEC_FLAG2_WPRED 0x00000020 ///< H.264 weighted biprediction for B-frames -#endif #define CODEC_FLAG2_MIXED_REFS 0x00000040 ///< H.264 one reference per partition, as opposed to one reference per macroblock +#endif #define CODEC_FLAG2_8X8DCT 0x00000080 ///< H.264 high profile 8x8 transform #define CODEC_FLAG2_FASTPSKIP 0x00000100 ///< H.264 fast pskip #define CODEC_FLAG2_AUD 0x00000200 ///< H.264 access unit delimiters diff --git a/libavcodec/libx264.c b/libavcodec/libx264.c index bf2aacb5d8c32..3ebc0a8ed9309 100644 --- a/libavcodec/libx264.c +++ b/libavcodec/libx264.c @@ -53,6 +53,7 @@ typedef struct X264Context { int ssim; int intra_refresh; int b_pyramid; + int mixed_refs; } X264Context; static void X264_log(void *p, int level, const char *fmt, va_list args) @@ -244,7 +245,6 @@ static av_cold int X264_init(AVCodecContext *avctx) x4->params.analyse.i_me_range = avctx->me_range; x4->params.analyse.i_subpel_refine = avctx->me_subpel_quality; - x4->params.analyse.b_mixed_references = avctx->flags2 & CODEC_FLAG2_MIXED_REFS; x4->params.analyse.b_chroma_me = avctx->me_cmp & FF_CMP_CHROMA; x4->params.analyse.b_transform_8x8 = avctx->flags2 & CODEC_FLAG2_8X8DCT; x4->params.analyse.b_fast_pskip = avctx->flags2 & CODEC_FLAG2_FASTPSKIP; @@ -326,6 +326,7 @@ static av_cold int X264_init(AVCodecContext *avctx) x4->params.b_intra_refresh = avctx->flags2 & CODEC_FLAG2_INTRA_REFRESH; x4->params.i_bframe_pyramid = avctx->flags2 & CODEC_FLAG2_BPYRAMID ? X264_B_PYRAMID_NORMAL : X264_B_PYRAMID_NONE; x4->params.analyse.b_weighted_bipred = avctx->flags2 & CODEC_FLAG2_WPRED; + x4->params.analyse.b_mixed_references = avctx->flags2 & CODEC_FLAG2_MIXED_REFS; #endif if (x4->aq_mode >= 0) @@ -349,7 +350,8 @@ static av_cold int X264_init(AVCodecContext *avctx) x4->params.b_intra_refresh = x4->intra_refresh; if (x4->b_pyramid >= 0) x4->params.i_bframe_pyramid = x4->b_pyramid; - + if (x4->mixed_refs >= 0) + x4->params.analyse.b_mixed_references = x4->mixed_refs; if (x4->fastfirstpass) x264_param_apply_fastfirstpass(&x4->params); @@ -443,6 +445,7 @@ static const AVOption options[] = { { "none", NULL, 0, FF_OPT_TYPE_CONST, {X264_B_PYRAMID_NONE}, INT_MIN, INT_MAX, VE, "b_pyramid" }, { "strict", "Strictly hierarchical pyramid", 0, FF_OPT_TYPE_CONST, {X264_B_PYRAMID_STRICT}, INT_MIN, INT_MAX, VE, "b_pyramid" }, { "normal", "Non-strict (not Blu-ray compatible)", 0, FF_OPT_TYPE_CONST, {X264_B_PYRAMID_NORMAL}, INT_MIN, INT_MAX, VE, "b_pyramid" }, + { "mixed-refs", "One reference per partition, as opposed to one reference per macroblock", OFFSET(mixed_refs), FF_OPT_TYPE_INT, {-1}, -1, 1, VE }, { NULL }, }; diff --git a/libavcodec/options.c b/libavcodec/options.c index 90ffb1cf8ad30..f6fd6e545ed86 100644 --- a/libavcodec/options.c +++ b/libavcodec/options.c @@ -390,8 +390,8 @@ static const AVOption options[]={ #if FF_API_X264_GLOBAL_OPTS {"bpyramid", "allows B-frames to be used as references for predicting", 0, FF_OPT_TYPE_CONST, {.dbl = CODEC_FLAG2_BPYRAMID }, INT_MIN, INT_MAX, V|E, "flags2"}, {"wpred", "weighted biprediction for b-frames (H.264)", 0, FF_OPT_TYPE_CONST, {.dbl = CODEC_FLAG2_WPRED }, INT_MIN, INT_MAX, V|E, "flags2"}, -#endif {"mixed_refs", "one reference per partition, as opposed to one reference per macroblock", 0, FF_OPT_TYPE_CONST, {.dbl = CODEC_FLAG2_MIXED_REFS }, INT_MIN, INT_MAX, V|E, "flags2"}, +#endif {"dct8x8", "high profile 8x8 transform (H.264)", 0, FF_OPT_TYPE_CONST, {.dbl = CODEC_FLAG2_8X8DCT }, INT_MIN, INT_MAX, V|E, "flags2"}, {"fastpskip", "fast pskip (H.264)", 0, FF_OPT_TYPE_CONST, {.dbl = CODEC_FLAG2_FASTPSKIP }, INT_MIN, INT_MAX, V|E, "flags2"}, {"aud", "access unit delimiters (H.264)", 0, FF_OPT_TYPE_CONST, {.dbl = CODEC_FLAG2_AUD }, INT_MIN, INT_MAX, V|E, "flags2"},