From 14c5e64fd915dc0cdd3656dec3711ff820b14e2e Mon Sep 17 00:00:00 2001 From: cehoyos Date: Mon, 12 Oct 2009 21:17:38 +0000 Subject: Support SMPTE-240M colourspace in vo_vdpau. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29771 b3059339-0415-0410-9bf9-f77b7e298cf2 --- DOCS/man/en/mplayer.1 | 2 ++ libvo/vo_vdpau.c | 7 ++++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/DOCS/man/en/mplayer.1 b/DOCS/man/en/mplayer.1 index 45b1abb6fb..7361045c12 100644 --- a/DOCS/man/en/mplayer.1 +++ b/DOCS/man/en/mplayer.1 @@ -3508,6 +3508,8 @@ space will be used. 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 diff --git a/libvo/vo_vdpau.c b/libvo/vo_vdpau.c index 40bc9a70b8..daf442be2d 100644 --- a/libvo/vo_vdpau.c +++ b/libvo/vo_vdpau.c @@ -410,8 +410,8 @@ static int update_csc_matrix(void) 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 @@ static const char help_msg[] = " 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 @@ static int preinit(const char *arg) 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; -- cgit v1.2.3