From 93e623c642d3966b74bd0b4913357527123546f5 Mon Sep 17 00:00:00 2001
From: Anton Khirnov <anton@khirnov.net>
Date: Mon, 22 Aug 2011 07:55:34 +0200
Subject: libx264: add 'psy_rd' private option.

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

diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index 65064ea2e1..29b6994aec 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -2740,7 +2740,6 @@ typedef struct AVCodecContext {
      * - decoding: unused
      */
     attribute_deprecated float aq_strength;
-#endif
 
     /**
      * PSY RD
@@ -2748,7 +2747,8 @@ typedef struct AVCodecContext {
      * - encoding: Set by user
      * - decoding: unused
      */
-    float psy_rd;
+    attribute_deprecated float psy_rd;
+#endif
 
     /**
      * PSY trellis
diff --git a/libavcodec/libx264.c b/libavcodec/libx264.c
index b46e10a73d..45f55b46bf 100644
--- a/libavcodec/libx264.c
+++ b/libavcodec/libx264.c
@@ -45,6 +45,7 @@ typedef struct X264Context {
     int cqp;
     int aq_mode;
     float aq_strength;
+    float psy_rd;
 } X264Context;
 
 static void X264_log(void *p, int level, const char *fmt, va_list args)
@@ -239,7 +240,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_rd           = avctx->psy_rd;
     x4->params.analyse.f_psy_trellis      = avctx->psy_trellis;
 
     x4->params.analyse.i_me_range         = avctx->me_range;
@@ -313,12 +313,17 @@ static av_cold int X264_init(AVCodecContext *avctx)
         x4->params.rc.i_aq_mode = avctx->aq_mode;
     if (avctx->aq_strength >= 0)
         x4->params.rc.f_aq_strength = avctx->aq_strength;
+    if (avctx->psy_rd >= 0)
+        x4->params.analyse.f_psy_rd           = avctx->psy_rd;
 #endif
 
     if (x4->aq_mode >= 0)
         x4->params.rc.i_aq_mode = x4->aq_mode;
     if (x4->aq_strength >= 0)
         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->fastfirstpass)
         x264_param_apply_fastfirstpass(&x4->params);
@@ -399,6 +404,7 @@ static const AVOption options[] = {
     { "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" },
     { "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},
     { NULL },
 };
 
diff --git a/libavcodec/options.c b/libavcodec/options.c
index 7b94d1315c..a7b904993a 100644
--- a/libavcodec/options.c
+++ b/libavcodec/options.c
@@ -437,7 +437,9 @@ static const AVOption options[]={
 {"color_range", NULL, OFFSET(color_range), FF_OPT_TYPE_INT, {.dbl = AVCOL_RANGE_UNSPECIFIED }, 0, AVCOL_RANGE_NB-1, V|E|D},
 {"chroma_sample_location", NULL, OFFSET(chroma_sample_location), FF_OPT_TYPE_INT, {.dbl = AVCHROMA_LOC_UNSPECIFIED }, 0, AVCHROMA_LOC_NB-1, V|E|D},
 {"psy", "use psycho visual optimization", 0, FF_OPT_TYPE_CONST, {.dbl = CODEC_FLAG2_PSY }, INT_MIN, INT_MAX, V|E, "flags2"},
-{"psy_rd", "specify psycho visual strength", OFFSET(psy_rd), FF_OPT_TYPE_FLOAT, {.dbl = 1.0 }, 0, FLT_MAX, V|E},
+#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
 {"aq_mode", "specify aq method", OFFSET(aq_mode), FF_OPT_TYPE_INT, {.dbl = -1 }, -1, INT_MAX, V|E},
-- 
cgit v1.2.3