[x265] [PATCH] api: change default AQ mode to 1

[Steve Borho]

# HG changeset patch
# User Steve Borho <steve at borho.org>
# Date 1418406321 21600
#      Fri Dec 12 11:45:21 2014 -0600
# Node ID 11022c73e80b1d5b9b9d443cc6d5cf8edc22608d
# Parent  139858488d1c40191db82ea2231119dfaf2885c8
api: change default AQ mode to 1

We've received a lot of feedback that AQ mode 2 is often problematic, but AQ
mode 1 is generally safe and useful.

diff -r 139858488d1c -r 11022c73e80b doc/reST/cli.rst
--- a/doc/reST/cli.rst	Fri Dec 12 11:17:44 2014 -0600
+++ b/doc/reST/cli.rst	Fri Dec 12 11:45:21 2014 -0600
@@ -920,8 +920,8 @@
 	and not enough in flat areas.
 
 	0. disabled
-	1. AQ enabled
-	2. AQ enabled with auto-variance **(default)**
+	1. AQ enabled **(default)**
+	2. AQ enabled with auto-variance
 
 .. option:: --aq-strength <float>
 
diff -r 139858488d1c -r 11022c73e80b source/common/param.cpp
--- a/source/common/param.cpp	Fri Dec 12 11:17:44 2014 -0600
+++ b/source/common/param.cpp	Fri Dec 12 11:45:21 2014 -0600
@@ -195,7 +195,7 @@
     param->rc.qpStep = 4;
     param->rc.rateControlMode = X265_RC_CRF;
     param->rc.qp = 32;
-    param->rc.aqMode = X265_AQ_AUTO_VARIANCE;
+    param->rc.aqMode = X265_AQ_VARIANCE;
     param->rc.aqStrength = 1.0;
     param->rc.cuTree = 1;
     param->rc.rfConstantMax = 0;
diff -r 139858488d1c -r 11022c73e80b source/x265.h
--- a/source/x265.h	Fri Dec 12 11:17:44 2014 -0600
+++ b/source/x265.h	Fri Dec 12 11:45:21 2014 -0600
@@ -818,7 +818,7 @@
         /* Enable adaptive quantization. This mode distributes available bits between all
          * CTUs of a frame, assigning more bits to low complexity areas. Turning
          * this ON will usually affect PSNR negatively, however SSIM and visual quality
-         * generally improves. Default: X265_AQ_AUTO_VARIANCE */
+         * generally improves. Default: X265_AQ_VARIANCE */
         int       aqMode;
 
         /* Sets the strength of AQ bias towards low detail CTUs. Valid only if