# HG changeset patch # User Pradeep Ramachandran <[email protected]> # Date 1503296436 -19800 # Mon Aug 21 11:50:36 2017 +0530 # Node ID fcd9154fa4e28ae9e3c11e16bfae20dbdb89101d # Parent d58761d8db4a2952be0d79a327ae1346631db64d cli: Align color primaries names to ffmpeg
All color primaries' names are now aligned to what ffmpeg uses as specified in https://github.com/FFmpeg/FFmpeg/blob/master/libavutil/pixdesc.c#L2251-L2306 diff -r d58761d8db4a -r fcd9154fa4e2 source/CMakeLists.txt --- a/source/CMakeLists.txt Fri Aug 04 01:48:28 2017 +0800 +++ b/source/CMakeLists.txt Mon Aug 21 11:50:36 2017 +0530 @@ -29,7 +29,7 @@ option(STATIC_LINK_CRT "Statically link C runtime for release builds" OFF) mark_as_advanced(FPROFILE_USE FPROFILE_GENERATE NATIVE_BUILD) # X265_BUILD must be incremented each time the public API is changed -set(X265_BUILD 133) +set(X265_BUILD 134) configure_file("${PROJECT_SOURCE_DIR}/x265.def.in" "${PROJECT_BINARY_DIR}/x265.def") configure_file("${PROJECT_SOURCE_DIR}/x265_config.h.in" diff -r d58761d8db4a -r fcd9154fa4e2 source/x265.h --- a/source/x265.h Fri Aug 04 01:48:28 2017 +0800 +++ b/source/x265.h Mon Aug 21 11:50:36 2017 +0530 @@ -523,15 +523,15 @@ /* String values accepted by x265_param_parse() (and CLI) for various parameters */ static const char * const x265_motion_est_names[] = { "dia", "hex", "umh", "star", "sea", "full", 0 }; static const char * const x265_source_csp_names[] = { "i400", "i420", "i422", "i444", "nv12", "nv16", 0 }; -static const char * const x265_video_format_names[] = { "component", "pal", "ntsc", "secam", "mac", "undef", 0 }; +static const char * const x265_video_format_names[] = { "component", "pal", "ntsc", "secam", "mac", "unknown", 0 }; 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", "smpte-st-428", "smpte-rp-431", "smpte-eg-432", 0 }; -static const char * const x265_transfer_names[] = { "", "bt709", "undef", "", "bt470m", "bt470bg", "smpte170m", "smpte240m", "linear", "log100", +static const char * const x265_colorprim_names[] = { "reserved", "bt709", "unknown", "reserved", "bt470m", "bt470bg", "smpte170m", "smpte240m", "film", "bt2020", "smpte428", "smpte431", "smpte432", 0 }; +static const char * const x265_transfer_names[] = { "reserved", "bt709", "unknown", "reserved", "bt470m", "bt470bg", "smpte170m", "smpte240m", "linear", "log100", "log316", "iec61966-2-4", "bt1361e", "iec61966-2-1", "bt2020-10", "bt2020-12", - "smpte-st-2084", "smpte-st-428", "arib-std-b67", 0 }; -static const char * const x265_colmatrix_names[] = { "GBR", "bt709", "undef", "", "fcc", "bt470bg", "smpte170m", "smpte240m", - "YCgCo", "bt2020nc", "bt2020c", "smpte-st-2085", "chroma-nc", "chroma-c", "ictcp", 0 }; -static const char * const x265_sar_names[] = { "undef", "1:1", "12:11", "10:11", "16:11", "40:33", "24:11", "20:11", + "smpte2084", "smpte428", "arib-std-b67", 0 }; +static const char * const x265_colmatrix_names[] = { "gbr", "bt709", "unknown", "", "fcc", "bt470bg", "smpte170m", "smpte240m", + "ycgco", "bt2020nc", "bt2020c", "smpte2085", "chroma-derived-nc", "chroma-derived-c", "ictcp", 0 }; +static const char * const x265_sar_names[] = { "unknown", "1:1", "12:11", "10:11", "16:11", "40:33", "24:11", "20:11", "32:11", "80:33", "18:11", "15:11", "64:33", "160:99", "4:3", "3:2", "2:1", 0 }; static const char * const x265_interlace_names[] = { "prog", "tff", "bff", 0 }; static const char * const x265_analysis_names[] = { "off", "save", "load", 0 };
# HG changeset patch # User Pradeep Ramachandran <[email protected]> # Date 1503296436 -19800 # Mon Aug 21 11:50:36 2017 +0530 # Node ID fcd9154fa4e28ae9e3c11e16bfae20dbdb89101d # Parent d58761d8db4a2952be0d79a327ae1346631db64d cli: Align color primaries names to ffmpeg All color primaries' names are now aligned to what ffmpeg uses as specified in https://github.com/FFmpeg/FFmpeg/blob/master/libavutil/pixdesc.c#L2251-L2306 diff -r d58761d8db4a -r fcd9154fa4e2 source/CMakeLists.txt --- a/source/CMakeLists.txt Fri Aug 04 01:48:28 2017 +0800 +++ b/source/CMakeLists.txt Mon Aug 21 11:50:36 2017 +0530 @@ -29,7 +29,7 @@ option(STATIC_LINK_CRT "Statically link C runtime for release builds" OFF) mark_as_advanced(FPROFILE_USE FPROFILE_GENERATE NATIVE_BUILD) # X265_BUILD must be incremented each time the public API is changed -set(X265_BUILD 133) +set(X265_BUILD 134) configure_file("${PROJECT_SOURCE_DIR}/x265.def.in" "${PROJECT_BINARY_DIR}/x265.def") configure_file("${PROJECT_SOURCE_DIR}/x265_config.h.in" diff -r d58761d8db4a -r fcd9154fa4e2 source/x265.h --- a/source/x265.h Fri Aug 04 01:48:28 2017 +0800 +++ b/source/x265.h Mon Aug 21 11:50:36 2017 +0530 @@ -523,15 +523,15 @@ /* String values accepted by x265_param_parse() (and CLI) for various parameters */ static const char * const x265_motion_est_names[] = { "dia", "hex", "umh", "star", "sea", "full", 0 }; static const char * const x265_source_csp_names[] = { "i400", "i420", "i422", "i444", "nv12", "nv16", 0 }; -static const char * const x265_video_format_names[] = { "component", "pal", "ntsc", "secam", "mac", "undef", 0 }; +static const char * const x265_video_format_names[] = { "component", "pal", "ntsc", "secam", "mac", "unknown", 0 }; 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", "smpte-st-428", "smpte-rp-431", "smpte-eg-432", 0 }; -static const char * const x265_transfer_names[] = { "", "bt709", "undef", "", "bt470m", "bt470bg", "smpte170m", "smpte240m", "linear", "log100", +static const char * const x265_colorprim_names[] = { "reserved", "bt709", "unknown", "reserved", "bt470m", "bt470bg", "smpte170m", "smpte240m", "film", "bt2020", "smpte428", "smpte431", "smpte432", 0 }; +static const char * const x265_transfer_names[] = { "reserved", "bt709", "unknown", "reserved", "bt470m", "bt470bg", "smpte170m", "smpte240m", "linear", "log100", "log316", "iec61966-2-4", "bt1361e", "iec61966-2-1", "bt2020-10", "bt2020-12", - "smpte-st-2084", "smpte-st-428", "arib-std-b67", 0 }; -static const char * const x265_colmatrix_names[] = { "GBR", "bt709", "undef", "", "fcc", "bt470bg", "smpte170m", "smpte240m", - "YCgCo", "bt2020nc", "bt2020c", "smpte-st-2085", "chroma-nc", "chroma-c", "ictcp", 0 }; -static const char * const x265_sar_names[] = { "undef", "1:1", "12:11", "10:11", "16:11", "40:33", "24:11", "20:11", + "smpte2084", "smpte428", "arib-std-b67", 0 }; +static const char * const x265_colmatrix_names[] = { "gbr", "bt709", "unknown", "", "fcc", "bt470bg", "smpte170m", "smpte240m", + "ycgco", "bt2020nc", "bt2020c", "smpte2085", "chroma-derived-nc", "chroma-derived-c", "ictcp", 0 }; +static const char * const x265_sar_names[] = { "unknown", "1:1", "12:11", "10:11", "16:11", "40:33", "24:11", "20:11", "32:11", "80:33", "18:11", "15:11", "64:33", "160:99", "4:3", "3:2", "2:1", 0 }; static const char * const x265_interlace_names[] = { "prog", "tff", "bff", 0 }; static const char * const x265_analysis_names[] = { "off", "save", "load", 0 };
_______________________________________________ x265-devel mailing list [email protected] https://mailman.videolan.org/listinfo/x265-devel
