diff options
| author | Kevin Wheatley <kevin.j.wheatley@gmail.com> | 2015-08-28 15:20:22 +0100 |
|---|---|---|
| committer | Vittorio Giovara <vittorio.giovara@gmail.com> | 2015-09-17 10:31:43 +0200 |
| commit | 4a664224502b42e3b28949d905a8de7769892184 (patch) | |
| tree | 6d8a4edee5dc4095688e08c67ede41acd25913d3 /libavutil | |
| parent | 777885983533235ccda5145f96317fc8cd0a18ab (diff) | |
pixfmt: Add new SMPTE color primaries and transfer characteristic values
Appeared in ITU-T Rec H.265 10/2014.
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Diffstat (limited to 'libavutil')
| -rw-r--r-- | libavutil/pixdesc.c | 3 | ||||
| -rw-r--r-- | libavutil/pixfmt.h | 3 | ||||
| -rw-r--r-- | libavutil/version.h | 2 |
3 files changed, 6 insertions, 2 deletions
diff --git a/libavutil/pixdesc.c b/libavutil/pixdesc.c index 029291ac62..9e7d8bd099 100644 --- a/libavutil/pixdesc.c +++ b/libavutil/pixdesc.c @@ -1589,13 +1589,14 @@ static const char *color_range_names[AVCOL_RANGE_NB] = { static const char *color_primaries_names[AVCOL_PRI_NB] = { "reserved", "bt709", "unknown", "reserved", "bt470m", "bt470bg", "smpte170m", "smpte240m", "film", "bt2020", + "smptest428-1", }; static const char *color_transfer_names[AVCOL_TRC_NB] = { "reserved", "bt709", "unknown", "reserved", "bt470m", "bt470bg", "smpte170m", "smpte240m", "linear", "log100", "log316", "iec61966-2-4", "bt1361e", "iec61966-2-1", - "bt2020-10", "bt2020-20", + "bt2020-10", "bt2020-20", "smptest2084", "smptest428-1", }; static const char *color_space_names[AVCOL_SPC_NB] = { diff --git a/libavutil/pixfmt.h b/libavutil/pixfmt.h index ffc7256c8f..4e0c0d392e 100644 --- a/libavutil/pixfmt.h +++ b/libavutil/pixfmt.h @@ -288,6 +288,7 @@ enum AVColorPrimaries { AVCOL_PRI_SMPTE240M = 7, ///< functionally identical to above AVCOL_PRI_FILM = 8, ///< colour filters using Illuminant C AVCOL_PRI_BT2020 = 9, ///< ITU-R BT2020 + AVCOL_PRI_SMPTEST428_1 = 10, ///< SMPTE ST 428-1 (CIE 1931 XYZ) AVCOL_PRI_NB, ///< Not part of ABI }; @@ -311,6 +312,8 @@ enum AVColorTransferCharacteristic { AVCOL_TRC_IEC61966_2_1 = 13, ///< IEC 61966-2-1 (sRGB or sYCC) AVCOL_TRC_BT2020_10 = 14, ///< ITU-R BT2020 for 10 bit system AVCOL_TRC_BT2020_12 = 15, ///< ITU-R BT2020 for 12 bit system + AVCOL_TRC_SMPTEST2084 = 16, ///< SMPTE ST 2084 for 10, 12, 14 and 16 bit systems + AVCOL_TRC_SMPTEST428_1 = 17, ///< SMPTE ST 428-1 AVCOL_TRC_NB, ///< Not part of ABI }; diff --git a/libavutil/version.h b/libavutil/version.h index 8640450e97..3c12d7192a 100644 --- a/libavutil/version.h +++ b/libavutil/version.h @@ -54,7 +54,7 @@ */ #define LIBAVUTIL_VERSION_MAJOR 55 -#define LIBAVUTIL_VERSION_MINOR 0 +#define LIBAVUTIL_VERSION_MINOR 1 #define LIBAVUTIL_VERSION_MICRO 0 #define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \ |