[x265] [PATCH] api: add support for transfer characteristics added in HEVC V2

[Steve Borho]

# HG changeset patch
# User Steve Borho <steve at borho.org>
# Date 1425606640 21600
#      Thu Mar 05 19:50:40 2015 -0600
# Node ID c858a8c488b0875144c3dab1a41cb988ac114da3
# Parent  6c6dc366774654d01a16566bb47c14899c82639f
api: add support for transfer characteristics added in HEVC V2

diff -r 6c6dc3667746 -r c858a8c488b0 source/common/param.cpp
--- a/source/common/param.cpp	Thu Mar 05 16:01:49 2015 -0800
+++ b/source/common/param.cpp	Thu Mar 05 19:50:40 2015 -0600
@@ -1088,11 +1088,11 @@
           "Color Primaries must be undef, bt709, bt470m,"
           " bt470bg, smpte170m, smpte240m, film or bt2020");
     CHECK(param->vui.transferCharacteristics < 0
-          || param->vui.transferCharacteristics > 15
+          || param->vui.transferCharacteristics > 17
           || param->vui.transferCharacteristics == 3,
           "Transfer Characteristics must be undef, bt709, bt470m, bt470bg,"
           " smpte170m, smpte240m, linear, log100, log316, iec61966-2-4, bt1361e,"
-          " iec61966-2-1, bt2020-10 or bt2020-12");
+          " iec61966-2-1, bt2020-10, bt2020-12, smpte-st-2084 or smpte-st-428");
     CHECK(param->vui.matrixCoeffs < 0
           || param->vui.matrixCoeffs > 10
           || param->vui.matrixCoeffs == 3,
diff -r 6c6dc3667746 -r c858a8c488b0 source/x265.h
--- a/source/x265.h	Thu Mar 05 16:01:49 2015 -0800
+++ b/source/x265.h	Thu Mar 05 19:50:40 2015 -0600
@@ -325,7 +325,8 @@
 static const char * const x265_fullrange_names[] = { "limited", "full", 0 };
 static const char * const x265_colorprim_names[] = { "", "bt709", "undef", "", "bt470m", "bt470bg", "smpte170m", "smpte240m", "film", "bt2020", 0 };
 static const char * const x265_transfer_names[] = { "", "bt709", "undef", "", "bt470m", "bt470bg", "smpte170m", "smpte240m", "linear", "log100",
-                                                    "log316", "iec61966-2-4", "bt1361e", "iec61966-2-1", "bt2020-10", "bt2020-12", 0 };
+                                                    "log316", "iec61966-2-4", "bt1361e", "iec61966-2-1", "bt2020-10", "bt2020-12",
+                                                    "smpte-st-2084", "smpte-st-428", 0 };
 static const char * const x265_colmatrix_names[] = { "GBR", "bt709", "undef", "", "fcc", "bt470bg", "smpte170m", "smpte240m",
                                                      "YCgCo", "bt2020nc", "bt2020c", 0 };
 static const char * const x265_sar_names[] = { "undef", "1:1", "12:11", "10:11", "16:11", "40:33", "24:11", "20:11",