summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/video_dec/libvdpau/alterh264_decode.c3
-rw-r--r--src/video_dec/libvdpau/alterh264_decode.h1
-rw-r--r--src/video_dec/libvdpau/vdpau_h264.c3
-rw-r--r--src/video_dec/libvdpau/vdpau_mpeg4.c4
-rw-r--r--src/video_dec/libvdpau/vdpau_vc1.c1
-rw-r--r--src/video_out/video_out_vdpau.c13
-rw-r--r--src/xine-engine/accel_vdpau.h2
7 files changed, 0 insertions, 27 deletions
diff --git a/src/video_dec/libvdpau/alterh264_decode.c b/src/video_dec/libvdpau/alterh264_decode.c
index 1f5c6904b..55e9fdfae 100644
--- a/src/video_dec/libvdpau/alterh264_decode.c
+++ b/src/video_dec/libvdpau/alterh264_decode.c
@@ -383,7 +383,6 @@ reset_sequence (sequence_t * sequence)
dpb_reset (sequence);
memset (&sequence->cur_pic, 0, sizeof (dpb_frame_t));
sequence->reset = VO_NEW_SEQUENCE_FLAG;
- sequence->color_standard = VDP_COLOR_STANDARD_ITUR_BT_601;
}
@@ -1843,8 +1842,6 @@ decode_render (vdpau_h264_alter_decoder_t * vd, int bad_frame)
xine_event_send (vd->stream, &event);
}
- accel->color_standard = seq->color_standard;
-
if (seq->cur_pic.completed == PICTURE_DONE)
{
seq->cur_pic.pts = seq->pic_pts;
diff --git a/src/video_dec/libvdpau/alterh264_decode.h b/src/video_dec/libvdpau/alterh264_decode.h
index 8aefeb21c..368f05430 100644
--- a/src/video_dec/libvdpau/alterh264_decode.h
+++ b/src/video_dec/libvdpau/alterh264_decode.h
@@ -305,7 +305,6 @@ typedef struct
uint16_t prevFrameNumOffset;
uint8_t prevMMC5;
- VdpColorStandard color_standard;
int chroma;
int top_field_first;
VdpDecoderProfile profile;
diff --git a/src/video_dec/libvdpau/vdpau_h264.c b/src/video_dec/libvdpau/vdpau_h264.c
index e8b354ea7..4ac54ad45 100644
--- a/src/video_dec/libvdpau/vdpau_h264.c
+++ b/src/video_dec/libvdpau/vdpau_h264.c
@@ -80,7 +80,6 @@ typedef struct vdpau_h264_decoder_s {
int decoder_started;
int progressive_cnt; /* count of progressive marked frames in line */
- VdpColorStandard color_standard;
VdpDecoderProfile profile;
vdpau_accel_t *vdpau_accel;
@@ -834,7 +833,6 @@ static void vdpau_h264_reset (video_decoder_t *this_gen) {
free_parser(this->nal_parser);
this->nal_parser = init_parser(this->xine);
- this->color_standard = VDP_COLOR_STANDARD_ITUR_BT_601;
this->video_step = 0;
if(this->codec_private_len > 0) {
@@ -943,7 +941,6 @@ static video_decoder_t *open_plugin (video_decoder_class_t *class_gen, xine_stre
this->decoder = VDP_INVALID_HANDLE;
this->vdp_runtime_nr = runtime_nr;
- this->color_standard = VDP_COLOR_STANDARD_ITUR_BT_601;
this->progressive_cnt = 0;
this->reset = VO_NEW_SEQUENCE_FLAG;
diff --git a/src/video_dec/libvdpau/vdpau_mpeg4.c b/src/video_dec/libvdpau/vdpau_mpeg4.c
index 6748fb6b6..d4325d490 100644
--- a/src/video_dec/libvdpau/vdpau_mpeg4.c
+++ b/src/video_dec/libvdpau/vdpau_mpeg4.c
@@ -178,8 +178,6 @@ typedef struct {
vdpau_accel_t *accel_vdpau;
- VdpColorStandard color_standard;
-
bits_reader_t br;
int vdp_runtime_nr;
@@ -282,7 +280,6 @@ static void reset_sequence( sequence_t *sequence, int free_refs )
sequence->backward_ref = NULL;
sequence->top_field_first = 0;
sequence->reset = VO_NEW_SEQUENCE_FLAG;
- sequence->color_standard = VDP_COLOR_STANDARD_ITUR_BT_709;
sequence->last_time_base = 0;
sequence->time_base = 0;
@@ -949,7 +946,6 @@ static void decode_picture( vdpau_mpeg4_decoder_t *vd )
img->bad_frame = 0;
if ( seq->video_step > 900 ) /* some buggy streams */
img->duration = seq->video_step;
- accel->color_standard = seq->color_standard;
if ( pic->vdp_infos.vop_coding_type < B_FRAME ) {
if ( pic->vdp_infos.vop_coding_type == I_FRAME && !seq->backward_ref ) {
diff --git a/src/video_dec/libvdpau/vdpau_vc1.c b/src/video_dec/libvdpau/vdpau_vc1.c
index 525f2185b..5c668829a 100644
--- a/src/video_dec/libvdpau/vdpau_vc1.c
+++ b/src/video_dec/libvdpau/vdpau_vc1.c
@@ -871,7 +871,6 @@ static void decode_picture( vdpau_vc1_decoder_t *vd )
img->pts = seq->seq_pts;
img->bad_frame = 0;
img->duration = seq->video_step;
- accel->color_standard = VDP_COLOR_STANDARD_ITUR_BT_709;
if ( pic->vdp_infos.picture_type<B_FRAME ) {
if ( pic->vdp_infos.picture_type==I_FRAME && !seq->backward_ref ) {
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;
diff --git a/src/xine-engine/accel_vdpau.h b/src/xine-engine/accel_vdpau.h
index 6f9590114..54eab7544 100644
--- a/src/xine-engine/accel_vdpau.h
+++ b/src/xine-engine/accel_vdpau.h
@@ -50,8 +50,6 @@ typedef struct {
VdpVideoSurface surface;
VdpChromaType chroma;
- VdpColorStandard color_standard;
-
int vdp_runtime_nr; /* this is used to keep in sync on preemptions */
int *current_vdp_runtime_nr;
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-30 09:42:10 +0000