From 41e7553762e4ba678b43e95d6fbe875e46f7116c Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Thu, 8 May 2014 12:15:34 +0300 Subject: [PATCH] libva-driver-intel: add upstream patches --- ...green-artifacts-when-decoding-mpeg-2.patch | 13 ++++++++ ...ntel-02_Return-error-when-trying-to-.patch | 30 +++++++++++++++++++ 2 files changed, 43 insertions(+) create mode 100644 packages/multimedia/libva-driver-intel/patches/libva-driver-intel-01_Fix-green-artifacts-when-decoding-mpeg-2.patch create mode 100644 packages/multimedia/libva-driver-intel/patches/libva-driver-intel-02_Return-error-when-trying-to-.patch diff --git a/packages/multimedia/libva-driver-intel/patches/libva-driver-intel-01_Fix-green-artifacts-when-decoding-mpeg-2.patch b/packages/multimedia/libva-driver-intel/patches/libva-driver-intel-01_Fix-green-artifacts-when-decoding-mpeg-2.patch new file mode 100644 index 0000000000..271552e4df --- /dev/null +++ b/packages/multimedia/libva-driver-intel/patches/libva-driver-intel-01_Fix-green-artifacts-when-decoding-mpeg-2.patch @@ -0,0 +1,13 @@ +diff --git a/src/i965_decoder_utils.c b/src/i965_decoder_utils.c +index 617bc15..f579f91 100644 +--- a/src/i965_decoder_utils.c ++++ b/src/i965_decoder_utils.c +@@ -139,7 +139,7 @@ mpeg2_set_reference_surfaces( + ref_frames[n++].surface_id = ref_frames[0].surface_id; + } + +- if (pic_param->picture_coding_extension.bits.progressive_frame) ++ if (pic_param->picture_coding_extension.bits.frame_pred_frame_dct) + return; + + ref_frames[2].surface_id = VA_INVALID_ID; diff --git a/packages/multimedia/libva-driver-intel/patches/libva-driver-intel-02_Return-error-when-trying-to-.patch b/packages/multimedia/libva-driver-intel/patches/libva-driver-intel-02_Return-error-when-trying-to-.patch new file mode 100644 index 0000000000..b85e529df9 --- /dev/null +++ b/packages/multimedia/libva-driver-intel/patches/libva-driver-intel-02_Return-error-when-trying-to-.patch @@ -0,0 +1,30 @@ +From a36f24198b46cba00a1d09f8c70dc86f36d98022 Mon Sep 17 00:00:00 2001 +From: Xiang, Haihao +Date: Mon, 05 May 2014 04:48:27 +0000 +Subject: Return error when trying to decoding an interlaced VC-1 video + +https://bugs.freedesktop.org/show_bug.cgi?id=77386 + +Signed-off-by: Xiang, Haihao +Reviewed-by: Zhao Yakui +--- +diff --git a/src/i965_decoder_utils.c b/src/i965_decoder_utils.c +index 2533381..617bc15 100644 +--- a/src/i965_decoder_utils.c ++++ b/src/i965_decoder_utils.c +@@ -654,7 +654,12 @@ intel_decoder_check_vc1_parameter(VADriverContextP ctx, + VAPictureParameterBufferVC1 *pic_param = (VAPictureParameterBufferVC1 *)decode_state->pic_param->buffer; + struct object_surface *obj_surface; + int i = 0; +- ++ ++ if (pic_param->sequence_fields.bits.interlace == 1 && ++ pic_param->picture_fields.bits.frame_coding_mode != 0) { /* frame-interlace or field-interlace */ ++ return VA_STATUS_ERROR_DECODING_ERROR; ++ } ++ + if (pic_param->picture_fields.bits.picture_type == 0 || + pic_param->picture_fields.bits.picture_type == 3) { + } else if (pic_param->picture_fields.bits.picture_type == 1 || +-- +cgit v0.9.0.2-2-gbebe