<div dir="ltr">Pushed the series into default.</div><br><div class="gmail_quote"><div dir="ltr" class="gmail_attr">On Wed, Mar 18, 2020 at 7:06 PM Snehaa Giridharan <<a href="mailto:snehaa@multicorewareinc.com">snehaa@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"># HG changeset patch<br># User Snehaa Giridharan <<a href="mailto:snehaa@multicorewareinc.com" target="_blank">snehaa@multicorewareinc.com</a>><br># Date 1581575253 -19800<br># Thu Feb 13 11:57:33 2020 +0530<br># Branch Release_3.3<br># Node ID 14e2b9794784f9a46197ed33e25b9ed94f17c298<br># Parent 69997e133cd665d6f98458c542241f36da701056<br>zone: Remove unnessary conditions on zone reconfig<br><br>This commit<br>- Removes unnessary conditions on zone reconfig<br>- Fixes crash with dynamic zone reconfig<br><br>diff --git a/source/common/param.cpp b/source/common/param.cpp<br>--- a/source/common/param.cpp<br>+++ b/source/common/param.cpp<br>@@ -2422,7 +2422,7 @@<br> dst->bResetZoneConfig = src->bResetZoneConfig;<br> dst->decoderVbvMaxRate = src->decoderVbvMaxRate;<br> <br>- if (src->rc.zonefileCount && src->rc.zones)<br>+ if (src->rc.zonefileCount && src->rc.zones && src->bResetZoneConfig)<br> {<br> for (int i = 0; i < src->rc.zonefileCount; i++)<br> {<br>diff --git a/source/encoder/api.cpp b/source/encoder/api.cpp<br>--- a/source/encoder/api.cpp<br>+++ b/source/encoder/api.cpp<br>@@ -1016,12 +1016,12 @@<br> <br> void x265_zone_free(x265_param *param)<br> {<br>- if (param && param->rc.zonefileCount) {<br>+ if (param && param->rc.zones && (param->rc.zoneCount || param->rc.zonefileCount))<br>+ {<br> for (int i = 0; i < param->rc.zonefileCount; i++)<br> x265_free(param->rc.zones[i].zoneParam);<br>+ x265_free(param->rc.zones);<br> }<br>- if (param && (param->rc.zoneCount || param->rc.zonefileCount))<br>- x265_free(param->rc.zones);<br> }<br> <br> static const x265_api libapi =<br>diff --git a/source/encoder/encoder.cpp b/source/encoder/encoder.cpp<br>--- a/source/encoder/encoder.cpp<br>+++ b/source/encoder/encoder.cpp<br>@@ -4106,7 +4106,7 @@<br> x265_log(p, X265_LOG_WARNING, "Radl requires fixed gop-length (keyint == min-keyint). Disabling radl.\n");<br> }<br> <br>- if ((p->chunkStart || p->chunkEnd) && p->bOpenGOP)<br>+ if ((p->chunkStart || p->chunkEnd) && p->bOpenGOP && m_param->bResetZoneConfig)<br> {<br> p->chunkStart = p->chunkEnd = 0;<br> x265_log(p, X265_LOG_WARNING, "Chunking requires closed gop structure. Disabling chunking.\n");<br>@@ -4139,12 +4139,6 @@<br> x265_log(p, X265_LOG_WARNING, "Turning on repeat - headers for zone encoding\n");<br> }<br> <br>- if (!m_param->bResetZoneConfig && (p->keyframeMax != p->keyframeMin))<br>- x265_log(p, X265_LOG_WARNING, "External zone reconfiguration requires a fixed GOP size to enable appropriate signaling of HRD info\n");<br>-<br>- if (!m_param->bResetZoneConfig && (p->reconfigWindowSize != (uint64_t)p->keyframeMax))<br>- x265_log(p, X265_LOG_WARNING, "Zone size must be multiple of GOP size to enable appropriate signaling of HRD info\n");<br>-<br> if (m_param->bEnableHME)<br> {<br> if (m_param->sourceHeight < 540)<br><div><br></div>-- <br><div dir="ltr"><div dir="ltr"><div><div dir="ltr"><div><div dir="ltr"><div><div dir="ltr"><div dir="ltr"><div><i><font face="georgia, serif">Thanks and Regards,</font></i></div><div><i><b><font face="georgia, serif">Snehaa.G</font></b></i></div></div></div></div></div></div></div></div></div></div></div><div id="gmail-m_5881957380866492049DAB4FAD8-2DD7-40BB-A1B8-4E2AA1F9FDF2"><br>
<table style="border-top:1px solid rgb(211,212,222)">
<tbody><tr>
<td style="width:55px;padding-top:13px"><a href="https://www.avast.com/en-in/recommend?utm_medium=email&utm_source=link&utm_campaign=sig-email&utm_content=webmail&utm_term=default3&tag=5d1cffcc-cd7a-478a-8410-76188ea236f6" target="_blank"><img src="https://ipmcdn.avast.com/images/icons/icon-envelope-tick-round-orange-animated-no-repeat-v1.gif" alt="" width="46" height="29" style="width: 46px; height: 29px;"></a></td>
<td style="width:470px;padding-top:12px;color:rgb(65,66,78);font-size:13px;font-family:Arial,Helvetica,sans-serif;line-height:18px">I’m protected online with Avast Free Antivirus. <a href="https://www.avast.com/en-in/recommend?utm_medium=email&utm_source=link&utm_campaign=sig-email&utm_content=webmail&utm_term=default3&tag=5d1cffcc-cd7a-478a-8410-76188ea236f6" style="color:rgb(68,83,234)" target="_blank">Get it here — it’s free forever.</a>
</td>
</tr>
</tbody></table><a href="#m_5881957380866492049_DAB4FAD8-2DD7-40BB-A1B8-4E2AA1F9FDF2" width="1" height="1"></a></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><br clear="all"><div><br></div>-- <br><div dir="ltr" class="gmail_signature"><div dir="ltr"><div><div dir="ltr"><div><div dir="ltr"><div><div dir="ltr"><font face="georgia, serif">Regards,</font><div><b><font face="georgia, serif">Aruna Matheswaran,</font></b></div><div><font face="georgia, serif">Video Codec Engineer,</font></div><div><font face="georgia, serif">Media & AI analytics BU,</font></div><div><span><span style="font-size:11pt;font-family:Arial;color:rgb(0,0,0);background-color:transparent;vertical-align:baseline;white-space:pre-wrap"><span style="border:none;display:inline-block;overflow:hidden;width:153px;height:58px"><img src="https://lh5.googleusercontent.com/gjX5cPNIZgwUrhfqkTwQUZWztIKmmo0qs3kbwvkS5H-bDVE2ftte9pMTVnFLSjOcjYWLtfc6_OGpxW4vraLg2r5QAIf1Q3MpldFDgWtzK_gXi8ptw5B3joIbsGL6mxj-JRdjHzT5" width="96" height="36" style="margin-left: 0px; margin-top: 0px;"></span></span></span><font face="georgia, serif"><br></font></div><div><span><span style="font-size:11pt;font-family:Arial;color:rgb(0,0,0);background-color:transparent;vertical-align:baseline;white-space:pre-wrap"><span style="border:none;display:inline-block;overflow:hidden;width:153px;height:58px"><img src="https://lh5.googleusercontent.com/gjX5cPNIZgwUrhfqkTwQUZWztIKmmo0qs3kbwvkS5H-bDVE2ftte9pMTVnFLSjOcjYWLtfc6_OGpxW4vraLg2r5QAIf1Q3MpldFDgWtzK_gXi8ptw5B3joIbsGL6mxj-JRdjHzT5" style="margin-left: 0px; margin-top: 0px;"></span></span></span><font face="georgia, serif"><br></font></div><div><font face="georgia, serif"><br></font></div></div></div></div></div></div></div></div></div>