<div dir="ltr"><div class="gmail_extra"><br><div class="gmail_quote">On Tue, Jul 17, 2018 at 4:12 PM, <span dir="ltr"><<a href="mailto:aruna@multicorewareinc.com" target="_blank">aruna@multicorewareinc.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"># HG changeset patch<br>
# User Aruna Matheswaran <<a href="mailto:aruna@multicorewareinc.com">aruna@multicorewareinc.com</a>><br>
# Date 1531824097 -19800<br>
# Tue Jul 17 16:11:37 2018 +0530<br>
# Node ID 0814c8fb835f7a29bf20aad1a24ac3<wbr>a16eafa62e<br>
# Parent 18eaffdd36384d04c907bdd9c3fd99<wbr>62d95af66d<br>
Allow overriding of aq-mode and cutree options when rc-grain is enabled.<br></blockquote><div><br></div><div>Pushed to default</div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
<br>
diff -r 18eaffdd3638 -r 0814c8fb835f doc/reST/presets.rst<br>
--- a/doc/reST/presets.rst Fri Jun 15 19:00:45 2018 +0530<br>
+++ b/doc/reST/presets.rst Tue Jul 17 16:11:37 2018 +0530<br>
@@ -156,7 +156,8 @@<br>
that strictly minimises QP fluctuations across frames, while still allowing <br>
the encoder to hit bitrate targets and VBV buffer limits (with a slightly <br>
higher margin of error than normal). It is highly recommended that this <br>
-algorithm is used only through the :option:`--tune` *grain* feature.<br>
+algorithm is used only through the :option:`--tune` *grain* feature. <br>
+Overriding the `--tune` *grain* settings might result in grain strobing.<br>
<br>
Fast Decode<br>
~~~~~~~~~~~<br>
diff -r 18eaffdd3638 -r 0814c8fb835f source/encoder/encoder.cpp<br>
--- a/source/encoder/encoder.cpp Fri Jun 15 19:00:45 2018 +0530<br>
+++ b/source/encoder/encoder.cpp Tue Jul 17 16:11:37 2018 +0530<br>
@@ -2830,13 +2830,6 @@<br>
p->bDistributeMotionEstimation = p->bDistributeModeAnalysis = 0;<br>
}<br>
<br>
- if (p->rc.bEnableGrain)<br>
- {<br>
- x265_log(p, X265_LOG_WARNING, "Rc Grain removes qp fluctuations caused by aq/cutree, Disabling aq,cu-tree\n");<br>
- p->rc.cuTree = 0;<br>
- p->rc.aqMode = 0;<br>
- }<br>
-<br>
if (p->bDistributeModeAnalysis && (p->limitReferences >> 1) && 1)<br>
{<br>
x265_log(p, X265_LOG_WARNING, "Limit reference options 2 and 3 are not supported with pmode. Disabling limit reference\n");<br>
<br>______________________________<wbr>_________________<br>
x265-devel mailing list<br>
<a href="mailto:x265-devel@videolan.org">x265-devel@videolan.org</a><br>
<a href="https://mailman.videolan.org/listinfo/x265-devel" rel="noreferrer" target="_blank">https://mailman.videolan.org/<wbr>listinfo/x265-devel</a><br>
<br></blockquote></div><br></div></div>