<div dir="ltr"><div class="gmail_extra"><div class="gmail_quote">On Fri, Aug 18, 2017 at 3:55 PM, Pradeep Ramachandran <span dir="ltr"><<a href="mailto:pradeep@multicorewareinc.com" target="_blank">pradeep@multicorewareinc.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"># HG changeset patch<br>
# User Pradeep Ramachandran <<a href="mailto:pradeep@multicorewareinc.com">pradeep@multicorewareinc.com</a>><br>
# Date 1503051756 -19800<br>
# Fri Aug 18 15:52:36 2017 +0530<br>
# Node ID 45b04c73eb70266e04b1f7cbb089d0<wbr>d4f48ebf74<br>
# Parent fdf39a97ecb8a8f8438c9023c244d9<wbr>788ffe18f1<br>
cli: Accept new color primaries as per revised HEVC spec<br></blockquote><div><br></div><div>Pushed to default branch</div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
<br>
diff -r fdf39a97ecb8 -r 45b04c73eb70 doc/reST/cli.rst<br>
--- a/doc/reST/cli.rst Tue Aug 08 18:26:35 2017 +0530<br>
+++ b/doc/reST/cli.rst Fri Aug 18 15:52:36 2017 +0530<br>
@@ -1912,6 +1912,9 @@<br>
7. smpte240m<br>
8. film<br>
9. bt2020<br>
+ 10. smpte-st-428<br>
+ 11. smpte-rp-431<br>
+ 12. smpte-eg-432<br>
<br>
.. option:: --transfer <integer|string><br>
<br>
@@ -1952,6 +1955,10 @@<br>
8. YCgCo<br>
9. bt2020nc<br>
10. bt2020c<br>
+ 11. smpte-st-2085<br>
+ 12. chroma-nc<br>
+ 13. chroma-c<br>
+ 14. ictcp<br>
<br>
.. option:: --chromaloc <0..5><br>
<br>
diff -r fdf39a97ecb8 -r 45b04c73eb70 source/common/param.cpp<br>
--- a/source/common/param.cpp Tue Aug 08 18:26:35 2017 +0530<br>
+++ b/source/common/param.cpp Fri Aug 18 15:52:36 2017 +0530<br>
@@ -1238,10 +1238,10 @@<br>
"Video Format must be component,"<br>
" pal, ntsc, secam, mac or undef");<br>
CHECK(param->vui.<wbr>colorPrimaries < 0<br>
- || param->vui.colorPrimaries > 9<br>
+ || param->vui.colorPrimaries > 12<br>
|| param->vui.colorPrimaries == 3,<br>
"Color Primaries must be undef, bt709, bt470m,"<br>
- " bt470bg, smpte170m, smpte240m, film or bt2020");<br>
+ " bt470bg, smpte170m, smpte240m, film, bt2020, smpte-st-428, smpte-rp-431 or smpte-eg-432");<br>
CHECK(param->vui.<wbr>transferCharacteristics < 0<br>
|| param->vui.<wbr>transferCharacteristics > 18<br>
|| param->vui.<wbr>transferCharacteristics == 3,<br>
@@ -1249,10 +1249,10 @@<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 > 10<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 or bt2020c");<br>
+ " smpte240m, GBR, YCgCo, bt2020nc, bt2020c, smpte-st-2085, chroma-nc, chroma-c or ictcp");<br>
CHECK(param->vui.<wbr>chromaSampleLocTypeTopField < 0<br>
|| param->vui.<wbr>chromaSampleLocTypeTopField > 5,<br>
"Chroma Sample Location Type Top Field must be 0-5");<br>
diff -r fdf39a97ecb8 -r 45b04c73eb70 source/x265.h<br>
--- a/source/x265.h Tue Aug 08 18:26:35 2017 +0530<br>
+++ b/source/x265.h Fri Aug 18 15:52:36 2017 +0530<br>
@@ -525,12 +525,12 @@<br>
static const char * const x265_source_csp_names[] = { "i400", "i420", "i422", "i444", "nv12", "nv16", 0 };<br>
static const char * const x265_video_format_names[] = { "component", "pal", "ntsc", "secam", "mac", "undef", 0 };<br>
static const char * const x265_fullrange_names[] = { "limited", "full", 0 };<br>
-static const char * const x265_colorprim_names[] = { "", "bt709", "undef", "", "bt470m", "bt470bg", "smpte170m", "smpte240m", "film", "bt2020", 0 };<br>
+static const char * const x265_colorprim_names[] = { "", "bt709", "undef", "", "bt470m", "bt470bg", "smpte170m", "smpte240m", "film", "bt2020", "smpte-st-428", "smpte-rp-431", "smpte-eg-432", 0 };<br>
static const char * const x265_transfer_names[] = { "", "bt709", "undef", "", "bt470m", "bt470bg", "smpte170m", "smpte240m", "linear", "log100",<br>
"log316", "iec61966-2-4", "bt1361e", "iec61966-2-1", "bt2020-10", "bt2020-12",<br>
"smpte-st-2084", "smpte-st-428", "arib-std-b67", 0 };<br>
static const char * const x265_colmatrix_names[] = { "GBR", "bt709", "undef", "", "fcc", "bt470bg", "smpte170m", "smpte240m",<br>
- "YCgCo", "bt2020nc", "bt2020c", 0 };<br>
+ "YCgCo", "bt2020nc", "bt2020c", "smpte-st-2085", "chroma-nc", "chroma-c", "ictcp", 0 };<br>
static const char * const x265_sar_names[] = { "undef", "1:1", "12:11", "10:11", "16:11", "40:33", "24:11", "20:11",<br>
"32:11", "80:33", "18:11", "15:11", "64:33", "160:99", "4:3", "3:2", "2:1", 0 };<br>
static const char * const x265_interlace_names[] = { "prog", "tff", "bff", 0 };<br>
diff -r fdf39a97ecb8 -r 45b04c73eb70 source/x265cli.h<br>
--- a/source/x265cli.h Tue Aug 08 18:26:35 2017 +0530<br>
+++ b/source/x265cli.h Fri Aug 18 15:52:36 2017 +0530<br>
@@ -506,12 +506,12 @@<br>
H0(" --videoformat <string> Specify video format from undef, component, pal, ntsc, secam, mac. Default undef\n");<br>
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 undef, bt709, bt470m, bt470bg, smpte170m,\n");<br>
- H0(" smpte240m, film, bt2020. Default undef\n");<br>
+ H0(" smpte240m, film, bt2020, smpte-st-428, smpte-rp-431, smpte-eg-432. Default undef\n");<br>
H0(" --transfer <string> Specify transfer characteristics from undef, bt709, bt470m, bt470bg, smpte170m,\n");<br>
H0(" smpte240m, linear, log100, log316, iec61966-2-4, bt1361e, iec61966-2-1,\n");<br>
H0(" bt2020-10, bt2020-12, smpte-st-2084, smpte-st-428, arib-std-b67. Default undef\n");<br>
H1(" --colormatrix <string> Specify color matrix setting from undef, bt709, fcc, bt470bg, smpte170m,\n");<br>
- H1(" smpte240m, GBR, YCgCo, bt2020nc, bt2020c. Default undef\n");<br>
+ H1(" smpte240m, GBR, YCgCo, bt2020nc, bt2020c, smpte-st-2085, chroma-nc, chroma-c, ictcp. Default undef\n");<br>
H1(" --chromaloc <integer> Specify chroma sample location (0 to 5). Default of %d\n", param->vui.<wbr>chromaSampleLocTypeTopField);<br>
H0(" --master-display <string> SMPTE ST 2086 master display color volume info SEI (HDR)\n");<br>
H0(" format: G(x,y)B(x,y)R(x,y)WP(x,y)L(<wbr>max,min)\n");<br>
</blockquote></div><br></div></div>