[x265] [PATCH] Allow overriding of aq-mode and cutree options when rc-grain is enabled

[aruna at multicorewareinc.com]

# HG changeset patch
# User Aruna Matheswaran <aruna at multicorewareinc.com>
# Date 1531824097 -19800
#      Tue Jul 17 16:11:37 2018 +0530
# Node ID 0814c8fb835f7a29bf20aad1a24ac3a16eafa62e
# Parent  18eaffdd36384d04c907bdd9c3fd9962d95af66d
Allow overriding of aq-mode and cutree options when rc-grain is enabled.

diff -r 18eaffdd3638 -r 0814c8fb835f doc/reST/presets.rst
--- a/doc/reST/presets.rst	Fri Jun 15 19:00:45 2018 +0530
+++ b/doc/reST/presets.rst	Tue Jul 17 16:11:37 2018 +0530
@@ -156,7 +156,8 @@
 that strictly minimises QP fluctuations across frames, while still allowing 
 the encoder to hit bitrate targets and VBV buffer limits (with a slightly 
 higher margin of error than normal). It is highly recommended that this 
-algorithm is used only through the :option:`--tune` *grain* feature.
+algorithm is used only through the :option:`--tune` *grain* feature. 
+Overriding the `--tune` *grain* settings might result in grain strobing.
 
 Fast Decode
 ~~~~~~~~~~~
diff -r 18eaffdd3638 -r 0814c8fb835f source/encoder/encoder.cpp
--- a/source/encoder/encoder.cpp	Fri Jun 15 19:00:45 2018 +0530
+++ b/source/encoder/encoder.cpp	Tue Jul 17 16:11:37 2018 +0530
@@ -2830,13 +2830,6 @@
         p->bDistributeMotionEstimation = p->bDistributeModeAnalysis = 0;
     }
 
-    if (p->rc.bEnableGrain)
-    {
-        x265_log(p, X265_LOG_WARNING, "Rc Grain removes qp fluctuations caused by aq/cutree, Disabling aq,cu-tree\n");
-        p->rc.cuTree = 0;
-        p->rc.aqMode = 0;
-    }
-
     if (p->bDistributeModeAnalysis && (p->limitReferences >> 1) && 1)
     {
         x265_log(p, X265_LOG_WARNING, "Limit reference options 2 and 3 are not supported with pmode. Disabling limit reference\n");
-------------- next part --------------
A non-text attachment was scrubbed...
Name: x265-clone.patch
Type: text/x-patch
Size: 1707 bytes
Desc: not available
URL: <http://mailman.videolan.org/pipermail/x265-devel/attachments/20180717/e6e0e0a2/attachment.bin>