From 2a44a8f6091913bad14c4df318ceeb68dc4a9258 Mon Sep 17 00:00:00 2001
From: Anton Khirnov <anton@khirnov.net>
Date: Mon, 22 Aug 2011 07:55:34 +0200
Subject: [PATCH] libx264: add 'psy_trellis' private option.

Deprecate corresponding global option.
---
 libavcodec/avcodec.h | 4 ++--
 libavcodec/libx264.c | 7 ++++++-
 libavcodec/options.c | 4 +---
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index 29b6994aec..c36c35e686 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -2748,7 +2748,6 @@ typedef struct AVCodecContext {
      * - decoding: unused
      */
     attribute_deprecated float psy_rd;
-#endif
 
     /**
      * PSY trellis
@@ -2756,7 +2755,8 @@ typedef struct AVCodecContext {
      * - encoding: Set by user
      * - decoding: unused
      */
-    float psy_trellis;
+    attribute_deprecated float psy_trellis;
+#endif
 
     /**
      * RC lookahead
diff --git a/libavcodec/libx264.c b/libavcodec/libx264.c
index 45f55b46bf..30bbfe6bc6 100644
--- a/libavcodec/libx264.c
+++ b/libavcodec/libx264.c
@@ -46,6 +46,7 @@ typedef struct X264Context {
     int aq_mode;
     float aq_strength;
     float psy_rd;
+    float psy_trellis;
 } X264Context;
 
 static void X264_log(void *p, int level, const char *fmt, va_list args)
@@ -240,7 +241,6 @@ static av_cold int X264_init(AVCodecContext *avctx)
     x4->params.rc.i_lookahead             = avctx->rc_lookahead;
 
     x4->params.analyse.b_psy              = avctx->flags2 & CODEC_FLAG2_PSY;
-    x4->params.analyse.f_psy_trellis      = avctx->psy_trellis;
 
     x4->params.analyse.i_me_range         = avctx->me_range;
     x4->params.analyse.i_subpel_refine    = avctx->me_subpel_quality;
@@ -315,6 +315,8 @@ static av_cold int X264_init(AVCodecContext *avctx)
         x4->params.rc.f_aq_strength = avctx->aq_strength;
     if (avctx->psy_rd >= 0)
         x4->params.analyse.f_psy_rd           = avctx->psy_rd;
+    if (avctx->psy_trellis >= 0)
+        x4->params.analyse.f_psy_trellis      = avctx->psy_trellis;
 #endif
 
     if (x4->aq_mode >= 0)
@@ -323,6 +325,8 @@ static av_cold int X264_init(AVCodecContext *avctx)
         x4->params.rc.f_aq_strength = x4->aq_strength;
     if (x4->psy_rd >= 0)
         x4->params.analyse.f_psy_rd = x4->psy_rd;
+    if (x4->psy_trellis >= 0)
+        x4->params.analyse.f_psy_trellis = x4->psy_trellis;
 
 
     if (x4->fastfirstpass)
@@ -405,6 +409,7 @@ static const AVOption options[] = {
     { "autovariance",  "Auto-variance AQ (experimental)", 0, FF_OPT_TYPE_CONST, {X264_AQ_AUTOVARIANCE}, INT_MIN, INT_MAX, VE, "aq_mode" },
     { "aq_strength",   "AQ strength. Reduces blocking and blurring in flat and textured areas.", OFFSET(aq_strength), FF_OPT_TYPE_FLOAT, {-1}, -1, FLT_MAX, VE},
     { "pdy_rd",        "Psy RD strength.",                                OFFSET(psy_rd),        FF_OPT_TYPE_FLOAT,  {-1 }, -1, FLT_MAX, VE},
+    { "psy_trellis",   "Psy trellis strength",                            OFFSET(psy_trellis),   FF_OPT_TYPE_FLOAT,  {-1 }, -1, FLT_MAX, VE},
     { NULL },
 };
 
diff --git a/libavcodec/options.c b/libavcodec/options.c
index a7b904993a..365f8608ad 100644
--- a/libavcodec/options.c
+++ b/libavcodec/options.c
@@ -439,9 +439,7 @@ static const AVOption options[]={
 {"psy", "use psycho visual optimization", 0, FF_OPT_TYPE_CONST, {.dbl = CODEC_FLAG2_PSY }, INT_MIN, INT_MAX, V|E, "flags2"},
 #if FF_API_X264_GLOBAL_OPTS
 {"psy_rd", "specify psycho visual strength", OFFSET(psy_rd), FF_OPT_TYPE_FLOAT, {.dbl = -1.0 }, -1, FLT_MAX, V|E},
-#endif
-{"psy_trellis", "specify psycho visual trellis", OFFSET(psy_trellis), FF_OPT_TYPE_FLOAT, {.dbl = 0 }, 0, FLT_MAX, V|E},
-#if FF_API_X264_GLOBAL_OPTS
+{"psy_trellis", "specify psycho visual trellis", OFFSET(psy_trellis), FF_OPT_TYPE_FLOAT, {.dbl = -1 }, -1, FLT_MAX, V|E},
 {"aq_mode", "specify aq method", OFFSET(aq_mode), FF_OPT_TYPE_INT, {.dbl = -1 }, -1, INT_MAX, V|E},
 {"aq_strength", "specify aq strength", OFFSET(aq_strength), FF_OPT_TYPE_FLOAT, {.dbl = -1.0 }, -1, FLT_MAX, V|E},
 #endif