RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-04-04 23:40:47 +00:00
Code Issues Releases Wiki Activity

Add new VDPAU feature high-quality-scaling (and require newer library).

Browse Source 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29823 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
cehoyos 2009-11-04 15:30:13 +00:00
parent b6712cc6c2
commit a10b3f08bf
3 changed files with 17 additions and 2 deletions

7
DOCS/man/en/mplayer.1
View File

@ -3511,6 +3511,13 @@ Use ITU-R BT.709 color space.
.IPs 3 .IPs 3
Use SMPTE-240M color space. Use SMPTE-240M color space.
.RE .RE
.IPs hqscaling
.RSss
.IPs 0
Use default VDPAU scaling (default).
.IPs 1\-9
Apply high quality VDPAU scaling (needs capable hardware).
.RE
.IPs force\-mixer .IPs force\-mixer
Forces the use of the VDPAU mixer, which implements all above options (default). Forces the use of the VDPAU mixer, which implements all above options (default).
Use noforce\-mixer to allow displaying BGRA colorspace. Use noforce\-mixer to allow displaying BGRA colorspace.

2
configure vendored
View File

@ -4339,7 +4339,7 @@ if test "$_vdpau" = auto ; then
if test "$_dl" = yes ; then if test "$_dl" = yes ; then
cat > $TMPC <<EOF cat > $TMPC <<EOF
#include <vdpau/vdpau_x11.h> #include <vdpau/vdpau_x11.h>
int main(void) {return VDP_VIDEO_MIXER_ATTRIBUTE_SKIP_CHROMA_DEINTERLACE;} int main(void) {return VDP_VIDEO_MIXER_FEATURE_HIGH_QUALITY_SCALING_L1;}
EOF EOF
cc_check && _vdpau=yes cc_check && _vdpau=yes
fi fi

10
libvo/vo_vdpau.c
View File

@ -165,6 +165,7 @@ static int chroma_deint;
static int force_mixer; static int force_mixer;
static int top_field_first; static int top_field_first;
static int flip; static int flip;
static int hqscaling;
static VdpDecoder decoder; static VdpDecoder decoder;
static int decoder_max_refs; static int decoder_max_refs;
@ -461,7 +462,7 @@ static int update_csc_matrix(void)
static int create_vdp_mixer(VdpChromaType vdp_chroma_type) static int create_vdp_mixer(VdpChromaType vdp_chroma_type)
{ {
#define VDP_NUM_MIXER_PARAMETER 3 #define VDP_NUM_MIXER_PARAMETER 3
#define MAX_NUM_FEATURES 5 #define MAX_NUM_FEATURES 6
int i; int i;
VdpStatus vdp_st; VdpStatus vdp_st;
int feature_count = 0; int feature_count = 0;
@ -493,6 +494,8 @@ static int create_vdp_mixer(VdpChromaType vdp_chroma_type)
features[feature_count++] = VDP_VIDEO_MIXER_FEATURE_NOISE_REDUCTION; features[feature_count++] = VDP_VIDEO_MIXER_FEATURE_NOISE_REDUCTION;
if (sharpen) if (sharpen)
features[feature_count++] = VDP_VIDEO_MIXER_FEATURE_SHARPNESS; features[feature_count++] = VDP_VIDEO_MIXER_FEATURE_SHARPNESS;
if (hqscaling)
features[feature_count++] = VDP_VIDEO_MIXER_FEATURE_HIGH_QUALITY_SCALING_L1 + (hqscaling - 1);
vdp_st = vdp_video_mixer_create(vdp_device, feature_count, features, vdp_st = vdp_video_mixer_create(vdp_device, feature_count, features,
VDP_NUM_MIXER_PARAMETER, VDP_NUM_MIXER_PARAMETER,
@ -1181,6 +1184,7 @@ static const opt_t subopts[] = {
{"sharpen", OPT_ARG_FLOAT, &sharpen, NULL}, {"sharpen", OPT_ARG_FLOAT, &sharpen, NULL},
{"colorspace", OPT_ARG_INT, &colorspace, NULL}, {"colorspace", OPT_ARG_INT, &colorspace, NULL},
{"force-mixer", OPT_ARG_BOOL, &force_mixer, NULL}, {"force-mixer", OPT_ARG_BOOL, &force_mixer, NULL},
{"hqscaling", OPT_ARG_INT, &hqscaling, (opt_test_f)int_non_neg},
{NULL} {NULL}
}; };
@ -1208,6 +1212,9 @@ static const char help_msg[] =
" 1: ITU-R BT.601 (default)\n" " 1: ITU-R BT.601 (default)\n"
" 2: ITU-R BT.709\n" " 2: ITU-R BT.709\n"
" 3: SMPTE-240M\n" " 3: SMPTE-240M\n"
" hqscaling\n"
" 0: default VDPAU scaler\n"
" 1-9: high quality VDPAU scaler (needs capable hardware)\n"
" force-mixer\n" " force-mixer\n"
" Use the VDPAU mixer (default)\n" " Use the VDPAU mixer (default)\n"
" Use noforce-mixer to allow BGRA output (disables all above options)\n" " Use noforce-mixer to allow BGRA output (disables all above options)\n"
@ -1230,6 +1237,7 @@ static int preinit(const char *arg)
sharpen = 0; sharpen = 0;
colorspace = 1; colorspace = 1;
force_mixer = 1; force_mixer = 1;
hqscaling = 0;
if (subopt_parse(arg, subopts) != 0) { if (subopt_parse(arg, subopts) != 0) {
mp_msg(MSGT_VO, MSGL_FATAL, help_msg); mp_msg(MSGT_VO, MSGL_FATAL, help_msg);
return -1; return -1;