# HG changeset patch
# User Ashok Kumar Mishra <[email protected]>
# Date 1537880196 -19800
# Tue Sep 25 18:26:36 2018 +0530
# Node ID ea2990bc9776a1d6ab27fec74a53033b3e28095e
# Parent bbad4e55b51a938dd4ce1375e0cb4dd4f59a5f27
FrameEncoder: Fix for building error
diff -r bbad4e55b51a -r ea2990bc9776 source/encoder/frameencoder.cpp
--- a/source/encoder/frameencoder.cpp Tue Sep 18 16:34:04 2018 +0530
+++ b/source/encoder/frameencoder.cpp Tue Sep 25 18:26:36 2018 +0530
@@ -556,41 +556,6 @@
/* Get the QP for this frame from rate control. This call may block until
* frames ahead of it in encode order have called rateControlEnd() */
- m_rce.encodeOrder = m_frame->m_encodeOrder;
- bool payloadChange = false;
- bool writeSei = true;
- if (m_param->bDhdr10opt)
- {
- for (int i = 0; i < m_frame->m_userSEI.numPayloads; i++)
- {
- x265_sei_payload *payload = &m_frame->m_userSEI.payloads[i];
- if(payload->payloadType == USER_DATA_REGISTERED_ITU_T_T35)
- {
- if (m_top->m_prevTonemapPayload.payload != NULL &&
payload->payloadSize == m_top->m_prevTonemapPayload.payloadSize)
- {
- if (memcmp(m_top->m_prevTonemapPayload.payload,
payload->payload, payload->payloadSize) != 0)
- payloadChange = true;
- }
- else
- {
- payloadChange = true;
- if (m_top->m_prevTonemapPayload.payload != NULL)
- x265_free(m_top->m_prevTonemapPayload.payload);
- m_top->m_prevTonemapPayload.payload =
(uint8_t*)x265_malloc(sizeof(uint8_t) * payload->payloadSize);
- }
-
- if (payloadChange)
- {
- m_top->m_prevTonemapPayload.payloadType =
payload->payloadType;
- m_top->m_prevTonemapPayload.payloadSize =
payload->payloadSize;
- memcpy(m_top->m_prevTonemapPayload.payload,
payload->payload, payload->payloadSize);
- }
-
- bool isIDR = m_frame->m_lowres.sliceType == X265_TYPE_IDR;
- writeSei = (payloadChange || isIDR);
- }
- }
- }
int qp = m_top->m_rateControl->rateControlStart(m_frame, &m_rce, m_top);
m_rce.newQp = qp;
@@ -679,6 +644,7 @@
m_outStreams[i].resetBits();
}
+ m_rce.encodeOrder = m_frame->m_encodeOrder;
int prevBPSEI = m_rce.encodeOrder ? m_top->m_lastBPSEI : 0;
if (m_frame->m_lowres.bKeyframe)
# HG changeset patch
# User Ashok Kumar Mishra <[email protected]>
# Date 1537880196 -19800
# Tue Sep 25 18:26:36 2018 +0530
# Node ID ea2990bc9776a1d6ab27fec74a53033b3e28095e
# Parent bbad4e55b51a938dd4ce1375e0cb4dd4f59a5f27
FrameEncoder: Fix for building error
diff -r bbad4e55b51a -r ea2990bc9776 source/encoder/frameencoder.cpp
--- a/source/encoder/frameencoder.cpp Tue Sep 18 16:34:04 2018 +0530
+++ b/source/encoder/frameencoder.cpp Tue Sep 25 18:26:36 2018 +0530
@@ -556,41 +556,6 @@
/* Get the QP for this frame from rate control. This call may block until
* frames ahead of it in encode order have called rateControlEnd() */
- m_rce.encodeOrder = m_frame->m_encodeOrder;
- bool payloadChange = false;
- bool writeSei = true;
- if (m_param->bDhdr10opt)
- {
- for (int i = 0; i < m_frame->m_userSEI.numPayloads; i++)
- {
- x265_sei_payload *payload = &m_frame->m_userSEI.payloads[i];
- if(payload->payloadType == USER_DATA_REGISTERED_ITU_T_T35)
- {
- if (m_top->m_prevTonemapPayload.payload != NULL && payload->payloadSize == m_top->m_prevTonemapPayload.payloadSize)
- {
- if (memcmp(m_top->m_prevTonemapPayload.payload, payload->payload, payload->payloadSize) != 0)
- payloadChange = true;
- }
- else
- {
- payloadChange = true;
- if (m_top->m_prevTonemapPayload.payload != NULL)
- x265_free(m_top->m_prevTonemapPayload.payload);
- m_top->m_prevTonemapPayload.payload = (uint8_t*)x265_malloc(sizeof(uint8_t) * payload->payloadSize);
- }
-
- if (payloadChange)
- {
- m_top->m_prevTonemapPayload.payloadType = payload->payloadType;
- m_top->m_prevTonemapPayload.payloadSize = payload->payloadSize;
- memcpy(m_top->m_prevTonemapPayload.payload, payload->payload, payload->payloadSize);
- }
-
- bool isIDR = m_frame->m_lowres.sliceType == X265_TYPE_IDR;
- writeSei = (payloadChange || isIDR);
- }
- }
- }
int qp = m_top->m_rateControl->rateControlStart(m_frame, &m_rce, m_top);
m_rce.newQp = qp;
@@ -679,6 +644,7 @@
m_outStreams[i].resetBits();
}
+ m_rce.encodeOrder = m_frame->m_encodeOrder;
int prevBPSEI = m_rce.encodeOrder ? m_top->m_lastBPSEI : 0;
if (m_frame->m_lowres.bKeyframe)
_______________________________________________
x265-devel mailing list
[email protected]
https://mailman.videolan.org/listinfo/x265-devel
