diff options
| author | Anton Khirnov <anton@khirnov.net> | 2011-08-22 07:55:34 +0200 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2011-08-31 10:25:34 +0200 |
| commit | 373257fa793b5ec2c22236a446d889018838e362 (patch) | |
| tree | 132a81b973b0fa863e1d182e3b9505d07f9e4682 /libavcodec/libx264.c | |
| parent | eab21c32e34d8dc45e915c597cf974f31a95c207 (diff) | |
| download | ffmpeg-373257fa793b5ec2c22236a446d889018838e362.tar.gz | |
libx264: add '8x8dct' private option.
Deprecate CODEC_FLAG2_8X8DCT.
Diffstat (limited to 'libavcodec/libx264.c')
| -rw-r--r-- | libavcodec/libx264.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/libavcodec/libx264.c b/libavcodec/libx264.c index 3ebc0a8ed9..d164dce28a 100644 --- a/libavcodec/libx264.c +++ b/libavcodec/libx264.c @@ -54,6 +54,7 @@ typedef struct X264Context { int intra_refresh; int b_pyramid; int mixed_refs; + int dct8x8; } X264Context; static void X264_log(void *p, int level, const char *fmt, va_list args) @@ -246,7 +247,6 @@ static av_cold int X264_init(AVCodecContext *avctx) x4->params.analyse.i_subpel_refine = avctx->me_subpel_quality; 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; x4->params.analyse.i_trellis = avctx->trellis; @@ -327,6 +327,7 @@ static av_cold int X264_init(AVCodecContext *avctx) 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; + x4->params.analyse.b_transform_8x8 = avctx->flags2 & CODEC_FLAG2_8X8DCT; #endif if (x4->aq_mode >= 0) @@ -352,6 +353,8 @@ static av_cold int X264_init(AVCodecContext *avctx) x4->params.i_bframe_pyramid = x4->b_pyramid; if (x4->mixed_refs >= 0) x4->params.analyse.b_mixed_references = x4->mixed_refs; + if (x4->dct8x8 >= 0) + x4->params.analyse.b_transform_8x8 = x4->dct8x8; if (x4->fastfirstpass) x264_param_apply_fastfirstpass(&x4->params); @@ -446,6 +449,7 @@ static const AVOption options[] = { { "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 }, + { "8x8dct", "High profile 8x8 transform.", OFFSET(dct8x8), FF_OPT_TYPE_INT, {-1 }, -1, 1, VE}, { NULL }, }; |