<div dir="ltr">Pushed to default. <br></div><br><div class="gmail_quote"><div dir="ltr" class="gmail_attr">On Tue, Jan 7, 2020 at 5:44 PM Aruna Matheswaran <<a href="mailto:aruna@multicorewareinc.com">aruna@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 Aruna Matheswaran <<a href="mailto:aruna@multicorewareinc.com" target="_blank">aruna@multicorewareinc.com</a>><br>
# Date 1578389851 -19800<br>
# Tue Jan 07 15:07:31 2020 +0530<br>
# Node ID 2d8cff8781baa983a56aa5bc72219241122fffc7<br>
# Parent 542653f9c733c0b41d33e204497bed1126455d17<br>
hdr: Replace --hdr with --hdr10<br>
<br>
This patch deprecates the existing option '--hdr' and replaces it with '--hdr10'<br>
as the feature signals SEI specific to HDR10.<br>
<br>
Note: '--hdr' will be removed in the upcoming major release of x265.<br>
<br>
diff -r 542653f9c733 -r 2d8cff8781ba doc/reST/cli.rst<br>
--- a/doc/reST/cli.rst Mon Jan 06 10:44:13 2020 +0530<br>
+++ b/doc/reST/cli.rst Tue Jan 07 15:07:31 2020 +0530<br>
@@ -2252,9 +2252,9 @@<br>
is specified. When enabled, signals max-cll and max-fall as 0 if :option:`max-cll` is unspecified.<br>
Default enabled.<br>
<br>
-.. option:: --hdr, --no-hdr<br>
-<br>
- Force signalling of HDR parameters in SEI packets. Enabled<br>
+.. option:: --hdr10, --no-hdr10<br>
+<br>
+ Force signaling of HDR10 parameters in SEI packets. Enabled<br>
automatically when :option:`--master-display` or :option:`--max-cll` is<br>
specified. Useful when there is a desire to signal 0 values for max-cll<br>
and max-fall. Default disabled.<br>
diff -r 542653f9c733 -r 2d8cff8781ba source/CMakeLists.txt<br>
--- a/source/CMakeLists.txt Mon Jan 06 10:44:13 2020 +0530<br>
+++ b/source/CMakeLists.txt Tue Jan 07 15:07:31 2020 +0530<br>
@@ -29,7 +29,7 @@<br>
option(STATIC_LINK_CRT "Statically link C runtime for release builds" OFF)<br>
mark_as_advanced(FPROFILE_USE FPROFILE_GENERATE NATIVE_BUILD)<br>
# X265_BUILD must be incremented each time the public API is changed<br>
-set(X265_BUILD 187)<br>
+set(X265_BUILD 188)<br>
configure_file("${PROJECT_SOURCE_DIR}/<a href="http://x265.def.in" rel="noreferrer" target="_blank">x265.def.in</a>"<br>
"${PROJECT_BINARY_DIR}/x265.def")<br>
configure_file("${PROJECT_SOURCE_DIR}/<a href="http://x265_config.h.in" rel="noreferrer" target="_blank">x265_config.h.in</a>"<br>
diff -r 542653f9c733 -r 2d8cff8781ba source/common/param.cpp<br>
--- a/source/common/param.cpp Mon Jan 06 10:44:13 2020 +0530<br>
+++ b/source/common/param.cpp Tue Jan 07 15:07:31 2020 +0530<br>
@@ -147,7 +147,8 @@<br>
param->bEnableAccessUnitDelimiters = 0;<br>
param->bEmitHRDSEI = 0;<br>
param->bEmitInfoSEI = 1;<br>
- param->bEmitHDRSEI = 0;<br>
+ param->bEmitHDRSEI = 0; /*Deprecated*/<br>
+ param->bEmitHDR10SEI = 0;<br>
param->bEmitIDRRecoverySEI = 0;<br>
<br>
/* CU definitions */<br>
@@ -1244,7 +1245,8 @@<br>
p->bSsimRd = atobool(value);<br>
}<br>
}<br>
- OPT("hdr") p->bEmitHDRSEI = atobool(value);<br>
+ OPT("hdr") p->bEmitHDR10SEI = atobool(value); /*DEPRECATED*/<br>
+ OPT("hdr10") p->bEmitHDR10SEI = atobool(value);<br>
OPT("hdr-opt") p->bHDR10Opt = atobool(value); /*DEPRECATED*/<br>
OPT("hdr10-opt") p->bHDR10Opt = atobool(value);<br>
OPT("limit-sao") p->bLimitSAO = atobool(value);<br>
@@ -1768,12 +1770,12 @@<br>
#endif<br>
<br>
if (param->masteringDisplayColorVolume || param->maxFALL || param->maxCLL)<br>
- param->bEmitHDRSEI = 1;<br>
+ param->bEmitHDR10SEI = 1;<br>
<br>
bool isSingleSEI = (param->bRepeatHeaders<br>
|| param->bEmitHRDSEI<br>
|| param->bEmitInfoSEI<br>
- || param->bEmitHDRSEI<br>
+ || param->bEmitHDR10SEI<br>
|| param->bEmitIDRRecoverySEI<br>
|| !!param->interlaceMode<br>
|| param->preferredTransferCharacteristics > 1<br>
@@ -2170,7 +2172,7 @@<br>
s += sprintf(s, " hist-threshold=%.2f", p->edgeTransitionThreshold);<br>
BOOL(p->bOptCUDeltaQP, "opt-cu-delta-qp");<br>
BOOL(p->bAQMotion, "aq-motion");<br>
- BOOL(p->bEmitHDRSEI, "hdr");<br>
+ BOOL(p->bEmitHDR10SEI, "hdr10");<br>
BOOL(p->bHDR10Opt, "hdr10-opt");<br>
BOOL(p->bDhdr10opt, "dhdr10-opt");<br>
BOOL(p->bEmitIDRRecoverySEI, "idr-recovery-sei");<br>
@@ -2495,7 +2497,7 @@<br>
dst->bAQMotion = src->bAQMotion;<br>
dst->bSsimRd = src->bSsimRd;<br>
dst->dynamicRd = src->dynamicRd;<br>
- dst->bEmitHDRSEI = src->bEmitHDRSEI;<br>
+ dst->bEmitHDR10SEI = src->bEmitHDR10SEI;<br>
dst->bEmitHRDSEI = src->bEmitHRDSEI;<br>
dst->bHDROpt = src->bHDROpt; /*DEPRECATED*/<br>
dst->bHDR10Opt = src->bHDR10Opt;<br>
diff -r 542653f9c733 -r 2d8cff8781ba source/encoder/encoder.cpp<br>
--- a/source/encoder/encoder.cpp Mon Jan 06 10:44:13 2020 +0530<br>
+++ b/source/encoder/encoder.cpp Tue Jan 07 15:07:31 2020 +0530<br>
@@ -3113,7 +3113,7 @@<br>
if (m_param->bSingleSeiNal)<br>
bs.resetBits();<br>
<br>
- if (m_param->bEmitHDRSEI)<br>
+ if (m_param->bEmitHDR10SEI)<br>
{<br>
if (m_param->bEmitCLL)<br>
{<br>
@@ -3370,7 +3370,7 @@<br>
p->vui.matrixCoeffs = dovi[doviProfile].matrixCoeffs;<br>
<br>
if (dovi[doviProfile].doviProfileId == 81)<br>
- p->bEmitHDRSEI = p->bEmitCLL = 1;<br>
+ p->bEmitHDR10SEI = p->bEmitCLL = 1;<br>
<br>
if (dovi[doviProfile].doviProfileId == 50)<br>
p->crQpOffset = 3;<br>
@@ -4086,7 +4086,7 @@<br>
}<br>
}<br>
<br>
- if (m_param->toneMapFile || p->bHDR10Opt || p->bEmitHDRSEI)<br>
+ if (m_param->toneMapFile || p->bHDR10Opt || p->bEmitHDR10SEI)<br>
{<br>
if (!p->bRepeatHeaders)<br>
{<br>
diff -r 542653f9c733 -r 2d8cff8781ba source/x265.h<br>
--- a/source/x265.h Mon Jan 06 10:44:13 2020 +0530<br>
+++ b/source/x265.h Tue Jan 07 15:07:31 2020 +0530<br>
@@ -1649,7 +1649,7 @@<br>
<br>
/* Enables the emitting of HDR SEI packets which contains HDR-specific params.<br>
* Auto-enabled when max-cll, max-fall, or mastering display info is specified.<br>
- * Default is disabled */<br>
+ * Default is disabled. Now deprecated.*/<br>
int bEmitHDRSEI;<br>
<br>
/* Enable luma and chroma offsets for HDR/WCG content.<br>
@@ -1896,6 +1896,11 @@<br>
<br>
/* Block-level QP optimization for HDR10 content. Default is disabled.*/<br>
int bHDR10Opt;<br>
+<br>
+ /* Enables the emitting of HDR10 SEI packets which contains HDR10-specific params.<br>
+ * Auto-enabled when max-cll, max-fall, or mastering display info is specified.<br>
+ * Default is disabled */<br>
+ int bEmitHDR10SEI;<br>
} x265_param;<br>
<br>
/* x265_param_alloc:<br>
diff -r 542653f9c733 -r 2d8cff8781ba source/x265cli.h<br>
--- a/source/x265cli.h Mon Jan 06 10:44:13 2020 +0530<br>
+++ b/source/x265cli.h Tue Jan 07 15:07:31 2020 +0530<br>
@@ -299,6 +299,8 @@<br>
{ "no-ssim-rd", no_argument, NULL, 0 },<br>
{ "hdr", no_argument, NULL, 0 },<br>
{ "no-hdr", no_argument, NULL, 0 },<br>
+ { "hdr10", no_argument, NULL, 0 },<br>
+ { "no-hdr10", no_argument, NULL, 0 },<br>
{ "hdr-opt", no_argument, NULL, 0 },<br>
{ "no-hdr-opt", no_argument, NULL, 0 },<br>
{ "hdr10-opt", no_argument, NULL, 0 },<br>
@@ -636,7 +638,7 @@<br>
H0(" format: G(x,y)B(x,y)R(x,y)WP(x,y)L(max,min)\n");<br>
H0(" --max-cll <string> Specify content light level info SEI as \"cll,fall\" (HDR).\n");<br>
H0(" --[no-]cll Emit content light level info SEI. Default %s\n", OPT(param->bEmitCLL));<br>
- H0(" --[no-]hdr Control dumping of HDR SEI packet. If max-cll or master-display has non-zero values, this is enabled. Default %s\n", OPT(param->bEmitHDRSEI));<br>
+ H0(" --[no-]hdr10 Control dumping of HDR10 SEI packet. If max-cll or master-display has non-zero values, this is enabled. Default %s\n", OPT(param->bEmitHDR10SEI));<br>
H0(" --[no-]hdr-opt Add luma and chroma offsets for HDR/WCG content. Default %s. Now deprecated.\n", OPT(param->bHDROpt));<br>
H0(" --[no-]HDR10-opt Block-level QP optimization for HDR10 content. Default %s.\n", OPT(param->bHDR10Opt));<br>
H0(" --min-luma <integer> Minimum luma plane value of input source picture\n");<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>