[vlc-commits] vlc_es: add BT470 and smpte240 xfer functions and more aliases

[Francois Cartegnie]

vlc | branch: master | Francois Cartegnie <fcvlcdev at free.fr> | Sun Dec 25 17:57:48 2016 +0100| [5d7129ac309e09b68027ec805d74f7f8268b7873] | committer: Francois Cartegnie

vlc_es: add BT470 and smpte240 xfer functions and more aliases

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=5d7129ac309e09b68027ec805d74f7f8268b7873
---

 include/vlc_es.h   | 9 ++++++++-
 src/input/es_out.c | 3 +++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/include/vlc_es.h b/include/vlc_es.h
index a8129a8..c8dd4c4 100644
--- a/include/vlc_es.h
+++ b/include/vlc_es.h
@@ -256,9 +256,16 @@ typedef enum video_transfer_func_t
     TRANSFER_FUNC_UNDEF,
     TRANSFER_FUNC_LINEAR,
     TRANSFER_FUNC_SRGB /*< Gamma 2.2 */,
+    TRANSFER_FUNC_BT470_BG,
+    TRANSFER_FUNC_BT470_M,
     TRANSFER_FUNC_BT709,
     TRANSFER_FUNC_SMPTE_ST2084,
-#define TRANSFER_FUNC_BT2020 TRANSFER_FUNC_BT709
+    TRANSFER_FUNC_SMPTE_240,
+#define TRANSFER_FUNC_BT2020            TRANSFER_FUNC_BT709
+#define TRANSFER_FUNC_SMPTE_170         TRANSFER_FUNC_BT709
+#define TRANSFER_FUNC_SMPTE_274         TRANSFER_FUNC_BT709
+#define TRANSFER_FUNC_SMPTE_293         TRANSFER_FUNC_BT709
+#define TRANSFER_FUNC_SMPTE_296         TRANSFER_FUNC_BT709
 } video_transfer_func_t;
 
 /**
diff --git a/src/input/es_out.c b/src/input/es_out.c
index a86679e..2efecd4 100644
--- a/src/input/es_out.c
+++ b/src/input/es_out.c
@@ -3058,8 +3058,11 @@ static void EsOutUpdateInfo( es_out_t *out, es_out_id_t *es, const es_format_t *
            static const char *func_names[] = { N_("Undefined"),
                N_("Linear"),
                "sRGB",
+               "ITU-R BT.470 BG",
+               "ITU-R BT.470 M",
                "ITU-R BT.709, ITU-R BT.2020",
                "SMPTE ST2084",
+               "SMPTE 240M",
            };
            if( fmt->video.transfer < ARRAY_SIZE(func_names) )
                 info_category_AddInfo( p_cat, _("Color transfer function"), "%s",