Mercurial > mplayer.hg

changeset 29729:42abcc270fb6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Support SMPTE-240M colourspace in vo_vdpau.
author cehoyos
date Mon, 12 Oct 2009 21:17:38 +0000
parents af460532dd3a
children 7527d95b03da
files DOCS/man/en/mplayer.1 libvo/vo_vdpau.c
diffstat 2 files changed, 6 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/DOCS/man/en/mplayer.1	Sun Oct 11 11:31:50 2009 +0000
+++ b/DOCS/man/en/mplayer.1	Mon Oct 12 21:17:38 2009 +0000
@@ -3508,6 +3508,8 @@
 Use ITU-R BT.601 color space (default).
 .IPs 2
 Use ITU-R BT.709 color space.
+.IPs 3
+Use SMPTE-240M color space.
 .RE
 .RE
 .PD 1
--- a/libvo/vo_vdpau.c	Sun Oct 11 11:31:50 2009 +0000
+++ b/libvo/vo_vdpau.c	Mon Oct 12 21:17:38 2009 +0000
@@ -410,8 +410,8 @@
     VdpCSCMatrix matrix;
     static const VdpVideoMixerAttribute attributes[] = {VDP_VIDEO_MIXER_ATTRIBUTE_CSC_MATRIX};
     const void *attribute_values[] = {&matrix};
-    static const VdpColorStandard vdp_colors[] = {0, VDP_COLOR_STANDARD_ITUR_BT_601, VDP_COLOR_STANDARD_ITUR_BT_709};
-    static const char * const vdp_names[] = {NULL, "BT.601", "BT.709"};
+    static const VdpColorStandard vdp_colors[] = {0, VDP_COLOR_STANDARD_ITUR_BT_601, VDP_COLOR_STANDARD_ITUR_BT_709, VDP_COLOR_STANDARD_SMPTE_240M};
+    static const char * const vdp_names[] = {NULL, "BT.601", "BT.709", "SMPTE-240M"};
     int csp = colorspace;
 
     if (!csp)
@@ -1094,6 +1094,7 @@
     "    0: guess based on video resolution\n"
     "    1: ITU-R BT.601 (default)\n"
     "    2: ITU-R BT.709\n"
+    "    3: SMPTE-240M\n"
     ;
 
 static int preinit(const char *arg)
@@ -1120,7 +1121,7 @@
         deint_type = deint;
     if (deint > 1)
         deint_buffer_past_frames = 1;
-    if (colorspace < 0 || colorspace > 2) {
+    if (colorspace < 0 || colorspace > 3) {
         mp_msg(MSGT_VO, MSGL_WARN, "[vdpau] Invalid color space specified, "
                "using BT.601\n");
         colorspace = 1;