diff options
| author | Anton Khirnov <anton@khirnov.net> | 2011-08-22 07:55:34 +0200 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2011-08-24 14:28:40 +0200 |
| commit | 85254fcb46b4af38510685bc48ae6aa557f861aa (patch) | |
| tree | a95931924d82e88d0421ceba3640c341af845cdd /libavcodec/libx264.c | |
| parent | 9d508e4914d6e9aafc8ae7ab0ff965a291ee42a8 (diff) | |
| download | ffmpeg-85254fcb46b4af38510685bc48ae6aa557f861aa.tar.gz | |
libx264: add 'aq_mode' private option.
Deprecate corresponding global option.
Diffstat (limited to 'libavcodec/libx264.c')
| -rw-r--r-- | libavcodec/libx264.c | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/libavcodec/libx264.c b/libavcodec/libx264.c index cafca18451..7d6f1408d0 100644 --- a/libavcodec/libx264.c +++ b/libavcodec/libx264.c @@ -43,6 +43,7 @@ typedef struct X264Context { int fastfirstpass; float crf; int cqp; + int aq_mode; } X264Context; static void X264_log(void *p, int level, const char *fmt, va_list args) @@ -234,7 +235,6 @@ static av_cold int X264_init(AVCodecContext *avctx) x4->params.analyse.i_me_method = X264_ME_TESA; else x4->params.analyse.i_me_method = X264_ME_HEX; - x4->params.rc.i_aq_mode = avctx->aq_mode; x4->params.rc.f_aq_strength = avctx->aq_strength; x4->params.rc.i_lookahead = avctx->rc_lookahead; @@ -308,6 +308,15 @@ static av_cold int X264_init(AVCodecContext *avctx) x4->params.rc.f_pb_factor = avctx->b_quant_factor; x4->params.analyse.i_chroma_qp_offset = avctx->chromaoffset; +#if FF_API_X264_GLOBAL_OPTS + if (avctx->aq_mode >= 0) + x4->params.rc.i_aq_mode = avctx->aq_mode; +#endif + + if (x4->aq_mode >= 0) + x4->params.rc.i_aq_mode = x4->aq_mode; + + if (x4->fastfirstpass) x264_param_apply_fastfirstpass(&x4->params); @@ -382,6 +391,10 @@ static const AVOption options[] = { { "fastfirstpass", "Use fast settings when encoding first pass", OFFSET(fastfirstpass), FF_OPT_TYPE_INT, { 1 }, 0, 1, VE}, { "crf", "Select the quality for constant quality mode", OFFSET(crf), FF_OPT_TYPE_FLOAT, {-1 }, -1, FLT_MAX, VE }, { "cqp", "Constant quantization parameter rate control method",OFFSET(cqp), FF_OPT_TYPE_INT, {-1 }, -1, INT_MAX, VE }, + { "aq_mode", "AQ method", OFFSET(aq_mode), FF_OPT_TYPE_INT, {-1 }, -1, INT_MAX, VE, "aq_mode"}, + { "none", NULL, 0, FF_OPT_TYPE_CONST, {X264_AQ_NONE}, INT_MIN, INT_MAX, VE, "aq_mode" }, + { "variance", "Variance AQ (complexity mask)", 0, FF_OPT_TYPE_CONST, {X264_AQ_VARIANCE}, INT_MIN, INT_MAX, VE, "aq_mode" }, + { "autovariance", "Auto-variance AQ (experimental)", 0, FF_OPT_TYPE_CONST, {X264_AQ_AUTOVARIANCE}, INT_MIN, INT_MAX, VE, "aq_mode" }, { NULL }, }; |