[vlc-devel] commit: x264: change aq-mode default same as libx264 uses (Ilkka Ollakka )

[git version control]

vlc | branch: 1.0-bugfix | Ilkka Ollakka <ileoo at videolan.org> | Mon Aug 10 13:49:44 2009 +0300| [b99e46b0a3f99f9e5b5c05c090d6064415ffd707] | committer: Ilkka Ollakka 

x264: change aq-mode default same as libx264 uses

Current description on default mode ain't actually any good, but didn't
find better from x264 commit-log. Feel free to add better description.
(cherry picked from commit 9353b58213c35d5595676c9336feb3f144847ed5)

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=b99e46b0a3f99f9e5b5c05c090d6064415ffd707
---

 modules/codec/x264.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/codec/x264.c b/modules/codec/x264.c
index 5602962..32f39e0 100644
--- a/modules/codec/x264.c
+++ b/modules/codec/x264.c
@@ -174,10 +174,10 @@ static void Close( vlc_object_t * );
 
 #if X264_BUILD >= 59
 #define AQ_MODE_TEXT N_("How AQ distributes bits")
-#define AQ_MODE_LONGTEXT N_("Defines bitdistribution mode for AQ, default 2\n" \
+#define AQ_MODE_LONGTEXT N_("Defines bitdistribution mode for AQ, default 1\n" \
         " - 0: Disabled\n"\
-        " - 1: Avoid moving bits between frames\n"\
-        " - 2: Move bits between frames")
+        " - 1: Current x264 default mode\n"\
+        " - 2: uses log(var)^2 instead of log(var) and attempts to adapt strength per frame")
 
 #define AQ_STRENGTH_TEXT N_("Strength of AQ")
 #define AQ_STRENGTH_LONGTEXT N_("Strength to reduce blocking and blurring in flat\n"\
@@ -557,7 +557,7 @@ vlc_module_begin ()
     add_float( SOUT_CFG_PREFIX "qblur", 0.5, NULL, QBLUR_TEXT,
                QBLUR_LONGTEXT, false )
 #if X264_BUILD >= 59
-    add_integer( SOUT_CFG_PREFIX "aq-mode", 2, NULL, AQ_MODE_TEXT,
+    add_integer( SOUT_CFG_PREFIX "aq-mode", X264_AQ_VARIANCE, NULL, AQ_MODE_TEXT,
                  AQ_MODE_LONGTEXT, false )
          change_integer_range( 0, 2 )
     add_float( SOUT_CFG_PREFIX "aq-strength", 1.0, NULL, AQ_STRENGTH_TEXT,