diff options
| author | Torsten Jager <t.jager@gmx.de> | 2013-04-11 20:38:05 +0300 |
|---|---|---|
| committer | Torsten Jager <t.jager@gmx.de> | 2013-04-11 20:38:05 +0300 |
| commit | 76be1a6f1a9dddd520b5aa2b26fec403fcaa779d (patch) | |
| tree | 2585ccc784003d013997a0ca0a2291a27e31772d /src/video_out | |
| parent | cf9a10013d61e44e3420d925beb5d694f4bb6043 (diff) | |
| download | xine-lib-76be1a6f1a9dddd520b5aa2b26fec403fcaa779d.tar.gz xine-lib-76be1a6f1a9dddd520b5aa2b26fec403fcaa779d.tar.bz2 | |
vdpau_accel_data: removed unused var
Diffstat (limited to 'src/video_out')
| -rw-r--r-- | src/video_out/video_out_vdpau.c | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/src/video_out/video_out_vdpau.c b/src/video_out/video_out_vdpau.c index 9bc7ba14a..c4c4ef74d 100644 --- a/src/video_out/video_out_vdpau.c +++ b/src/video_out/video_out_vdpau.c @@ -378,7 +378,6 @@ typedef struct { VdpChromaType video_mixer_chroma; uint32_t video_mixer_width; uint32_t video_mixer_height; - VdpColorStandard color_standard; VdpBool temporal_spatial_is_supported; VdpBool temporal_is_supported; VdpBool noise_reduction_is_supported; @@ -1071,7 +1070,6 @@ static vo_frame_t *vdpau_alloc_frame (vo_driver_t *this_gen) frame->vdpau_accel_data.vdp_device = vdp_device; frame->vdpau_accel_data.surface = VDP_INVALID_HANDLE; frame->vdpau_accel_data.chroma = VDP_CHROMA_TYPE_420; - frame->vdpau_accel_data.color_standard = this->color_standard; frame->vdpau_accel_data.vdp_decoder_create = vdp_decoder_create; frame->vdpau_accel_data.vdp_decoder_destroy = vdp_decoder_destroy; frame->vdpau_accel_data.vdp_decoder_render = vdp_decoder_render; @@ -1177,8 +1175,6 @@ static void vdpau_duplicate_frame_data (vo_frame_t *this_gen, vo_frame_t *origin if (st != VDP_STATUS_OK) fprintf(stderr, "vo_vdpau: failed to put surface bits !! %s\n", vdp_get_error_string(st)); - this->vdpau_accel_data.color_standard = orig->vdpau_accel_data.color_standard; - av_freep (&this->vo_frame.base[0]); av_freep (&this->vo_frame.base[1]); av_freep (&this->vo_frame.base[2]); @@ -1313,7 +1309,6 @@ static void vdpau_update_frame_format (vo_driver_t *this_gen, vo_frame_t *frame_ frame->surface_cleared_nr = this->surface_cleared_nr; } - frame->vdpau_accel_data.color_standard = VDP_COLOR_STANDARD_ITUR_BT_601; frame->ratio = ratio; frame->vo_frame.future_frame = NULL; } @@ -1615,16 +1610,12 @@ static void vdpau_update_csc_matrix (vdpau_driver_t *that, vdpau_frame_t *frame) switch (color_matrix >> 1) { case 1: kb = 0.0722; kr = 0.2126; /* ITU-R 709 */ - that->color_standard = VDP_COLOR_STANDARD_ITUR_BT_709; break; case 4: kb = 0.1100; kr = 0.3000; /* FCC */ - that->color_standard = VDP_COLOR_STANDARD_ITUR_BT_601; break; case 7: kb = 0.0870; kr = 0.2120; /* SMPTE 240 */ - that->color_standard = VDP_COLOR_STANDARD_SMPTE_240M; break; default: kb = 0.1140; kr = 0.2990; /* ITU-R 601 */ - that->color_standard = VDP_COLOR_STANDARD_ITUR_BT_601; } vr = 2.0 * (1.0 - kr); vg = -2.0 * kr * (1.0 - kr) / (1.0 - kb - kr); @@ -1857,7 +1848,6 @@ static void vdpau_display_frame (vo_driver_t *this_gen, vo_frame_t *frame_gen) VdpStatus st; VdpVideoSurface surface; VdpChromaType chroma = this->video_mixer_chroma; - VdpColorStandard color_standard = this->color_standard; uint32_t mix_w = this->video_mixer_width; uint32_t mix_h = this->video_mixer_height; VdpTime stream_speed; @@ -1921,7 +1911,6 @@ static void vdpau_display_frame (vo_driver_t *this_gen, vo_frame_t *frame_gen) mix_w = frame->width; mix_h = frame->height; chroma = (frame->vo_frame.flags & VO_CHROMA_422) ? VDP_CHROMA_TYPE_422 : VDP_CHROMA_TYPE_420; - color_standard = frame->vdpau_accel_data.color_standard; } else { /* unknown format */ @@ -1978,7 +1967,6 @@ static void vdpau_display_frame (vo_driver_t *this_gen, vo_frame_t *frame_gen) vdpau_set_inverse_telecine( this_gen ); vdpau_update_noise( this ); vdpau_update_sharpness( this ); - this->color_standard = color_standard; this->update_csc = 1; vdpau_update_skip_chroma( this ); vdpau_update_background( this ); @@ -3020,7 +3008,6 @@ static vo_driver_t *vdpau_open_plugin (video_driver_class_t *class_gen, const vo vdp_video_mixer_query_attribute_support( vdp_device, VDP_VIDEO_MIXER_ATTRIBUTE_SKIP_CHROMA_DEINTERLACE, &this->skip_chroma_is_supported ); vdp_video_mixer_query_attribute_support( vdp_device, VDP_VIDEO_MIXER_ATTRIBUTE_BACKGROUND_COLOR, &this->background_is_supported ); - this->color_standard = VDP_COLOR_STANDARD_ITUR_BT_601; this->video_mixer_chroma = chroma; this->video_mixer_width = this->soft_surface_width; this->video_mixer_height = this->soft_surface_height; |
