<div dir="ltr"><br><br><div class="gmail_quote"><div dir="ltr">On Tue, Sep 25, 2018 at 6:31 PM <<a href="mailto:ashok@multicorewareinc.com">ashok@multicorewareinc.com</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"># HG changeset patch<br>
# User Ashok Kumar Mishra <<a href="mailto:ashok@multicorewareinc.com" target="_blank">ashok@multicorewareinc.com</a>><br>
# Date 1537880196 -19800<br>
# Tue Sep 25 18:26:36 2018 +0530<br>
# Node ID ea2990bc9776a1d6ab27fec74a53033b3e28095e<br>
# Parent bbad4e55b51a938dd4ce1375e0cb4dd4f59a5f27<br>
FrameEncoder: Fix for building error<br>
<br>
diff -r bbad4e55b51a -r ea2990bc9776 source/encoder/frameencoder.cpp<br>
--- a/source/encoder/frameencoder.cpp Tue Sep 18 16:34:04 2018 +0530<br>
+++ b/source/encoder/frameencoder.cpp Tue Sep 25 18:26:36 2018 +0530<br>
@@ -556,41 +556,6 @@<br>
<br>
/* Get the QP for this frame from rate control. This call may block until<br>
* frames ahead of it in encode order have called rateControlEnd() */<br>
- m_rce.encodeOrder = m_frame->m_encodeOrder;<br>
- bool payloadChange = false;<br>
- bool writeSei = true;<br>
- if (m_param->bDhdr10opt)<br>
- {<br>
- for (int i = 0; i < m_frame->m_userSEI.numPayloads; i++)<br>
- {<br>
- x265_sei_payload *payload = &m_frame->m_userSEI.payloads[i];<br>
- if(payload->payloadType == USER_DATA_REGISTERED_ITU_T_T35)<br>
- {<br>
- if (m_top->m_prevTonemapPayload.payload != NULL && payload->payloadSize == m_top->m_prevTonemapPayload.payloadSize)<br>
- {<br>
- if (memcmp(m_top->m_prevTonemapPayload.payload, payload->payload, payload->payloadSize) != 0)<br>
- payloadChange = true;<br>
- }<br>
- else<br>
- {<br>
- payloadChange = true;<br>
- if (m_top->m_prevTonemapPayload.payload != NULL)<br>
- x265_free(m_top->m_prevTonemapPayload.payload);<br>
- m_top->m_prevTonemapPayload.payload = (uint8_t*)x265_malloc(sizeof(uint8_t) * payload->payloadSize);<br>
- }<br>
-<br>
- if (payloadChange)<br>
- {<br>
- m_top->m_prevTonemapPayload.payloadType = payload->payloadType;<br>
- m_top->m_prevTonemapPayload.payloadSize = payload->payloadSize;<br>
- memcpy(m_top->m_prevTonemapPayload.payload, payload->payload, payload->payloadSize);<br>
- }<br>
-<br>
- bool isIDR = m_frame->m_lowres.sliceType == X265_TYPE_IDR;<br>
- writeSei = (payloadChange || isIDR);<br>
- }<br>
- }<br>
- }<br>
int qp = m_top->m_rateControl->rateControlStart(m_frame, &m_rce, m_top);<br>
m_rce.newQp = qp;<br>
<br>
@@ -679,6 +644,7 @@<br>
m_outStreams[i].resetBits();<br>
}<br>
<br>
+ m_rce.encodeOrder = m_frame->m_encodeOrder;<br>
int prevBPSEI = m_rce.encodeOrder ? m_top->m_lastBPSEI : 0;<br>
<br>
if (m_frame->m_lowres.bKeyframe)<br></blockquote><div><br></div><div>Pushed to default. </div></div></div>