frodovdr/vdr-plugin-softhddevice
1
0
Fork 0
mirror of https://projects.vdr-developer.org/git/vdr-plugin-softhddevice.git synced 2023-10-10 19:16:51 +02:00
Code Issues Releases Wiki Activity

Add color standard support to vdpau.

Browse Source
This commit is contained in:
Johns 2012-01-05 20:24:18 +01:00
parent 0776bc5ee4
commit 761c06eac1
3 changed files with 42 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -1,6 +1,7 @@
User johns User johns
Data: Data:
VDPAU: Add color standard support.
VDPAU: Add denoise and sharpness support. VDPAU: Add denoise and sharpness support.
VDPAU: Add skip chroma deinterlace support. VDPAU: Add skip chroma deinterlace support.
VDPAU: Show OSD only if something is to display, improves performance. VDPAU: Show OSD only if something is to display, improves performance.

4
Todo
View File

@ -33,8 +33,8 @@ missing:
ITU BT601, ITU BT709 (HD), RGB studio levels (16-235)? ITU BT601, ITU BT709 (HD), RGB studio levels (16-235)?
vdpau: vdpau:
1080i with temporal spatial and level 1 scaling too slow with GT 520 1080i with temporal spatial and level 1 scaling too slow with my GT 520
1080i with temporal spatial too slow with GT 520 on some channels 1080i with temporal spatial too slow with my GT 520 on some channels
SkipChromaDeinterlace improves performance SkipChromaDeinterlace improves performance
Improve OSD handling, show only what is used. Big OSD costs performance Improve OSD handling, show only what is used. Big OSD costs performance
VdpPreemptionCallback handling VdpPreemptionCallback handling

48
video.c
View File

@ -179,7 +179,7 @@ typedef enum _video_zoom_modes_
#define CODEC_SURFACES_VC1 3 ///< 1 decode, up to 2 references #define CODEC_SURFACES_VC1 3 ///< 1 decode, up to 2 references
#define VIDEO_SURFACES_MAX 4 ///< video output surfaces for queue #define VIDEO_SURFACES_MAX 4 ///< video output surfaces for queue
#define OUTPUT_SURFACES_MAX 2 ///< output surfaces for flip page #define OUTPUT_SURFACES_MAX 4 ///< output surfaces for flip page
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
// Variables // Variables
@ -3105,6 +3105,7 @@ typedef struct _vdpau_decoder_
VdpDecoder VideoDecoder; ///< vdp video decoder VdpDecoder VideoDecoder; ///< vdp video decoder
VdpVideoMixer VideoMixer; ///< vdp video mixer VdpVideoMixer VideoMixer; ///< vdp video mixer
VdpChromaType ChromaType; ///< vdp video surface chroma format VdpChromaType ChromaType; ///< vdp video surface chroma format
VdpProcamp Procamp; ///< vdp procamp parameterization data
int SurfaceUsedN; ///< number of used video surfaces int SurfaceUsedN; ///< number of used video surfaces
/// used video surface ids /// used video surface ids
@ -3406,14 +3407,16 @@ static void VdpauMixerSetup(VdpauDecoder * decoder)
VdpVideoMixerParameter paramaters[4]; VdpVideoMixerParameter paramaters[4];
void const *value_ptrs[4]; void const *value_ptrs[4];
int parameter_n; int parameter_n;
VdpVideoMixerAttribute attributes[3]; VdpVideoMixerAttribute attributes[4];
void const *attribute_value_ptrs[3]; void const *attribute_value_ptrs[4];
int attribute_n; int attribute_n;
uint8_t skip_chroma_value; uint8_t skip_chroma_value;
float noise_reduction_level; float noise_reduction_level;
float sharpness_level; float sharpness_level;
VdpChromaType chroma_type; VdpChromaType chroma_type;
int layers; int layers;
VdpColorStandard color_standard;
VdpCSCMatrix csc_matrix[1];
// //
// Build feature table // Build feature table
@ -3515,11 +3518,14 @@ static void VdpauMixerSetup(VdpauDecoder * decoder)
} }
VdpauVideoMixerSetFeatureEnables(decoder->VideoMixer, feature_n, features, VdpauVideoMixerSetFeatureEnables(decoder->VideoMixer, feature_n, features,
enables); enables);
// FIXME: check status
//
// build attributes table
//
/* /*
FIXME: FIXME:
VDP_VIDEO_MIXER_ATTRIBUTE_NOISE_REDUCTION_LEVEL
VDP_VIDEO_MIXER_ATTRIBUTE_SHARPNESS_LEVEL
VDP_VIDEO_MIXER_ATTRIBUTE_LUMA_KEY_MIN_LUMA VDP_VIDEO_MIXER_ATTRIBUTE_LUMA_KEY_MIN_LUMA
VDP_VIDEO_MIXER_ATTRIBUTE_LUMA_KEY_MAX_LUMA VDP_VIDEO_MIXER_ATTRIBUTE_LUMA_KEY_MAX_LUMA
*/ */
@ -3548,12 +3554,29 @@ static void VdpauMixerSetup(VdpauDecoder * decoder)
Debug(3, "video/vdpau: sharpness level %+1.3f\n", sharpness_level); Debug(3, "video/vdpau: sharpness level %+1.3f\n", sharpness_level);
} }
if (decoder->InputWidth > 1280 || decoder->InputHeight > 576) {
// HDTV
color_standard = VDP_COLOR_STANDARD_ITUR_BT_709;
Debug(3, "video/vdpau: color space ITU-R BT.709\n");
} else {
// SDTV
color_standard = VDP_COLOR_STANDARD_ITUR_BT_601;
Debug(3, "video/vdpau: color space ITU-R BT.601\n");
}
status =
VdpauGenerateCSCMatrix(&decoder->Procamp, color_standard, csc_matrix);
if (status != VDP_STATUS_OK) {
Error(_("video/vdpau: can't generate CSC matrix: %s\n"),
VdpauGetErrorString(status));
}
attributes[attribute_n] = VDP_VIDEO_MIXER_ATTRIBUTE_CSC_MATRIX;
attribute_value_ptrs[attribute_n++] = csc_matrix;
VdpauVideoMixerSetAttributeValues(decoder->VideoMixer, attribute_n, VdpauVideoMixerSetAttributeValues(decoder->VideoMixer, attribute_n,
attributes, attribute_value_ptrs); attributes, attribute_value_ptrs);
// FIXME: check status
//VdpColorStandard color_standard;
//color_standard = VDP_COLOR_STANDARD_ITUR_BT_601;
//VdpGenerateCSCMatrix(procamp, standard, &csc_matrix);
} }
/// ///
@ -3606,6 +3629,13 @@ static VdpauDecoder *VdpauNewDecoder(void)
decoder->OutputWidth = VideoWindowWidth; decoder->OutputWidth = VideoWindowWidth;
decoder->OutputHeight = VideoWindowHeight; decoder->OutputHeight = VideoWindowHeight;
// Procamp operation parameterization data
decoder->Procamp.struct_version = VDP_PROCAMP_VERSION;
decoder->Procamp.brightness = 0.0;
decoder->Procamp.contrast = 1.0;
decoder->Procamp.saturation = 1.0;
decoder->Procamp.hue = 0.0; // default values
#ifdef noDEBUG #ifdef noDEBUG
// FIXME: for play // FIXME: for play
decoder->OutputX = 40; decoder->OutputX = 40;