<div dir="ltr"><div dir="ltr"><br></div><br><div class="gmail_quote"><div dir="ltr">On Tue, Jan 8, 2019 at 10:59 AM Pradeep Ramachandran <<a href="mailto:pradeep@multicorewareinc.com">pradeep@multicorewareinc.com</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex"><div dir="ltr"><div dir="ltr"><div><div dir="ltr" class="gmail-m_-992981619685911764gmail_signature"><div dir="ltr"><div><div dir="ltr"><div><div dir="ltr"><div><div dir="ltr"><div><div dir="ltr"><div dir="ltr"><div dir="ltr"><div dir="ltr"><div dir="ltr"><div><br></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div><br><div class="gmail_quote"><div dir="ltr">On Tue, Jan 8, 2019 at 9:34 AM <<a href="mailto:pooja@multicorewareinc.com" target="_blank">pooja@multicorewareinc.com</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex"># HG changeset patch<br>
# User Pooja Venkatesan <<a href="mailto:pooja@multicorewareinc.com" target="_blank">pooja@multicorewareinc.com</a>><br>
# Date 1546170546 -19800<br>
# Sun Dec 30 17:19:06 2018 +0530<br>
# Node ID 9c28a4122495d57b8ebd36ba37813b2cbfd60d28<br>
# Parent 8aebc58efe5cbd5bf04b32120184b082a940eb9b<br>
aq: Disable hevc-aq based on checks<br>
<br>
diff -r 8aebc58efe5c -r 9c28a4122495 source/common/param.cpp<br>
--- a/source/common/param.cpp Wed Jan 02 14:15:53 2019 +0530<br>
+++ b/source/common/param.cpp Sun Dec 30 17:19:06 2018 +0530<br>
@@ -353,6 +353,7 @@<br>
param->limitReferences = 0;<br>
param->rc.aqStrength = 0.0;<br>
param->rc.aqMode = X265_AQ_NONE;<br>
+ param->rc.hevcAq = 0;<br>
param->rc.qgSize = 32;<br>
param->bEnableFastIntra = 1;<br>
}<br>
@@ -370,6 +371,7 @@<br>
param->limitReferences = 0;<br>
param->rc.aqStrength = 0.0;<br>
param->rc.aqMode = X265_AQ_NONE;<br>
+ param->rc.hevcAq = 0;<br>
param->rc.qgSize = 32;<br>
param->bEnableSAO = 0;<br>
param->bEnableFastIntra = 1;<br>
diff -r 8aebc58efe5c -r 9c28a4122495 source/encoder/encoder.cpp<br>
--- a/source/encoder/encoder.cpp Wed Jan 02 14:15:53 2019 +0530<br>
+++ b/source/encoder/encoder.cpp Sun Dec 30 17:19:06 2018 +0530<br>
@@ -2677,6 +2677,7 @@<br>
{<br>
p->rc.qp = zone->rc.qp;<br>
p->rc.aqMode = X265_AQ_NONE;<br>
+ p->rc.hevcAq = 0;<br>
}<br>
p->radl = zone->radl;<br>
<br>
@@ -2811,6 +2812,7 @@<br>
if (p->rc.rateControlMode == X265_RC_CQP)<br>
{<br>
p->rc.aqMode = X265_AQ_NONE;<br>
+ p->rc.hevcAq = 0;<br>
p->rc.bitrate = 0;<br>
p->rc.cuTree = 0;<br>
p->rc.aqStrength = 0;<br>
@@ -2835,14 +2837,16 @@<br>
}<br>
<br>
if (p->rc.aqStrength == 0 && p->rc.cuTree == 0)<br>
+ {<br>
p->rc.aqMode = X265_AQ_NONE;<br>
+ p->rc.hevcAq = 0;<br>
+ }<br>
<br>
if (p->rc.aqMode == X265_AQ_NONE && p->rc.cuTree == 0)<br>
p->rc.aqStrength = 0;<br>
<br>
if (p->rc.hevcAq && p->rc.aqMode)<br>
{<br>
- p->rc.aqMode = X265_AQ_NONE;<br></blockquote><div><br></div><div>Isn't this disabling required? What happens when we enable hevc-aq + aq-mode now?</div></div></div></blockquote><div>No. The hierarchy for AQ modes works as aq-mode 0, hevc-aq, aq-mode 1 and then aq-mode 2. When we enable hevc-aq and aq-mode (2 by default) it works taking hevc-aq only. We can just leave the warning and should not disable aq-mode. <br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex"><div dir="ltr"><div class="gmail_quote"><div> </div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">
x265_log(p, X265_LOG_WARNING, "hevc-aq enabled, disabling other aq-modes\n");<br>
}<br>
<br>
_______________________________________________<br>
x265-devel mailing list<br>
<a href="mailto:x265-devel@videolan.org" target="_blank">x265-devel@videolan.org</a><br>
<a href="https://mailman.videolan.org/listinfo/x265-devel" rel="noreferrer" target="_blank">https://mailman.videolan.org/listinfo/x265-devel</a><br>
</blockquote></div></div>
_______________________________________________<br>
x265-devel mailing list<br>
<a href="mailto:x265-devel@videolan.org" target="_blank">x265-devel@videolan.org</a><br>
<a href="https://mailman.videolan.org/listinfo/x265-devel" rel="noreferrer" target="_blank">https://mailman.videolan.org/listinfo/x265-devel</a><br>
</blockquote></div></div>