<div dir="ltr"><div dir="ltr"><br></div><br><div class="gmail_quote"><div dir="ltr" class="gmail_attr">On Mon, Apr 20, 2020 at 10:38 AM Praveen Kumar Karadugattu <<a href="mailto:praveenkumar@multicorewareinc.com">praveenkumar@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>From 9207e6db602ea218aca7d03075339009429280ef Mon Sep 17 00:00:00 2001<br>From: Praveen Karadugattu <<a href="mailto:praveenkumar@multicorewareinc.com" target="_blank">praveenkumar@multicorewareinc.com</a>><br>Date: Fri, 17 Apr 2020 19:59:03 +0530<br>Subject: [PATCH] Fixed some of the wrongly represented cli parameters in the<br> docs related to --colormatrix and --videoformat.</div><div>---<br> doc/reST/cli.rst | 8 ++++----<br> source/common/param.cpp | 12 ++++++------<br> source/x265cli.cpp | 6 +++---<br> 3 files changed, 13 insertions(+), 13 deletions(-)</div><div>diff --git a/doc/reST/cli.rst b/doc/reST/cli.rst<br>index 1e2765d..0fad45b 100644<br>--- a/doc/reST/cli.rst<br>+++ b/doc/reST/cli.rst<br>@@ -2154,7 +2154,7 @@ VUI fields must be manually specified.<br> 2. ntsc<br> 3. secam<br> 4. mac<br>- 5. undefined<br>+ 5. unknown<br> <br> .. option:: --range <full|limited><br> <br>@@ -2207,15 +2207,15 @@ VUI fields must be manually specified.<br> Specify color matrix setting i.e set the matrix coefficients used in<br> deriving the luma and chroma. Default undefined (not signaled)<br> <br>- 0. GBR<br>+ 0. gbr<br> 1. bt709<br>- 2. undef <br>+ 2. unknown <br> 3. **reserved**<br> 4. fcc<br> 5. bt470bg<br> 6. smpte170m<br> 7. smpte240m<br>- 8. YCgCo<br>+ 8. ycgco<br> 9. bt2020nc<br> 10. bt2020c<br> 11. smpte2085<br>diff --git a/source/common/param.cpp b/source/common/param.cpp<br>index 908400f..b4965ce 100644<br>--- a/source/common/param.cpp<br>+++ b/source/common/param.cpp<br>@@ -1122,7 +1122,7 @@ int x265_param_parse(x265_param* p, const char* name, const char* value)<br> p->vui.bEnableOverscanInfoPresentFlag = 1;<br> p->vui.bEnableOverscanAppropriateFlag = 1;<br> }<br>- else if (!strcmp(value, "undef"))<br>+ else if (!strcmp(value, "unknown"))<br></div></div></div></blockquote><div>[AM] You are changing the API here. Please update X265_BUILD. </div><div>btw, there is no discrepancy between CLI values and the document of the "overscan" option.</div><div>Did you modify this to have uniform values across VUI options? If so, can we introduce "unknown" as an alias for "undef" and deprecate "undef" in the next version?</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> p->vui.bEnableOverscanInfoPresentFlag = 0;<br> else<br> bError = true;<br>@@ -1643,23 +1643,23 @@ int x265_check_params(x265_param* param)<br> "Sample Aspect Ratio height must be greater than 0");<br> CHECK(param->vui.videoFormat < 0 || param->vui.videoFormat > 5,<br> "Video Format must be component,"<br>- " pal, ntsc, secam, mac or undef");<br>+ " pal, ntsc, secam, mac or unknown");<br> CHECK(param->vui.colorPrimaries < 0<br> || param->vui.colorPrimaries > 12<br> || param->vui.colorPrimaries == 3,<br>- "Color Primaries must be undef, bt709, bt470m,"<br>+ "Color Primaries must be unknown, bt709, bt470m,"<br> " bt470bg, smpte170m, smpte240m, film, bt2020, smpte-st-428, smpte-rp-431 or smpte-eg-432");<br> CHECK(param->vui.transferCharacteristics < 0<br> || param->vui.transferCharacteristics > 18<br> || param->vui.transferCharacteristics == 3,<br>- "Transfer Characteristics must be undef, bt709, bt470m, bt470bg,"<br>+ "Transfer Characteristics must be unknown, bt709, bt470m, bt470bg,"<br> " smpte170m, smpte240m, linear, log100, log316, iec61966-2-4, bt1361e,"<br> " iec61966-2-1, bt2020-10, bt2020-12, smpte-st-2084, smpte-st-428 or arib-std-b67");<br> CHECK(param->vui.matrixCoeffs < 0<br> || param->vui.matrixCoeffs > 14<br> || param->vui.matrixCoeffs == 3,<br>- "Matrix Coefficients must be undef, bt709, fcc, bt470bg, smpte170m,"<br>- " smpte240m, GBR, YCgCo, bt2020nc, bt2020c, smpte-st-2085, chroma-nc, chroma-c or ictcp");<br>+ "Matrix Coefficients must be unknown, bt709, fcc, bt470bg, smpte170m,"<br>+ " smpte240m, gbr, ycgco, bt2020nc, bt2020c, smpte-st-2085, chroma-nc, chroma-c or ictcp");<br> CHECK(param->vui.chromaSampleLocTypeTopField < 0<br> || param->vui.chromaSampleLocTypeTopField > 5,<br> "Chroma Sample Location Type Top Field must be 0-5");<br>diff --git a/source/x265cli.cpp b/source/x265cli.cpp<br>index 05f16b7..4d91b99 100644<br>--- a/source/x265cli.cpp<br>+++ b/source/x265cli.cpp<br>@@ -291,8 +291,8 @@ namespace X265_NS {<br> H0(" 5=40:33, 6=24:11, 7=20:11, 8=32:11, 9=80:33, 10=18:11, 11=15:11,\n");<br> H0(" 12=64:33, 13=160:99, 14=4:3, 15=3:2, 16=2:1 or custom ratio of <int:int>. Default %d\n", param->vui.aspectRatioIdc);<br> H1(" --display-window <string> Describe overscan cropping region as 'left,top,right,bottom' in pixels\n");<br>- H1(" --overscan <string> Specify whether it is appropriate for decoder to show cropped region: undef, show or crop. Default undef\n");<br>- H0(" --videoformat <string> Specify video format from undef, component, pal, ntsc, secam, mac. Default undef\n");<br>+ H1(" --overscan <string> Specify whether it is appropriate for decoder to show cropped region: unknown, show or crop. Default undef\n");<br>+ H0(" --videoformat <string> Specify video format from unknown, component, pal, ntsc, secam, mac. Default undef\n");<br></div></div></div></blockquote><div>[AM] Update default values in these helplines. </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> H0(" --range <string> Specify black level and range of luma and chroma signals as full or limited Default limited\n");<br> H0(" --colorprim <string> Specify color primaries from bt709, unknown, reserved, bt470m, bt470bg, smpte170m,\n");<br> H0(" smpte240m, film, bt2020, smpte428, smpte431, smpte432. Default undef\n");<br>@@ -994,4 +994,4 @@ namespace X265_NS {<br> <br> #ifdef __cplusplus<br> }<br>-#endif<br>\ No newline at end of file<br>+#endif<br>-- <br>1.8.3.1</div><div><br></div></div></div>
</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></div>