Attachment 87182 Details for Bug 68792 – Proposed fix for #1

Proposed fix for #1

0001-st-vdpau-fix-GenerateCSCMatrix-with-NULL-procamp.patch (text/plain), 2.06 KB, created by Grigori Goronzy on 2013-10-06 12:19:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Grigori Goronzy

Created: 2013-10-06 12:19:00 UTC

Size: 2.06 KB

patch

obsolete

>From d4fe46e3501ece36b1a5b8dfe04b090e6ea36a47 Mon Sep 17 00:00:00 2001
>From: Grigori Goronzy <greg@chown.ath.cx>
>Date: Sun, 6 Oct 2013 13:20:39 +0200
>Subject: [PATCH] st/vdpau: fix GenerateCSCMatrix with NULL procamp
>
>As per API specification, it is legal to supply a NULL procamp. In this
>case, a CSC matrix according to the colorspace should be generated,
>but no further adjustments are made.
>
>Fixes an error with VLC's VDPAU module.
>---
> src/gallium/state_trackers/vdpau/mixer.c | 21 ++++++++++++---------
> 1 file changed, 12 insertions(+), 9 deletions(-)
>
>diff --git a/src/gallium/state_trackers/vdpau/mixer.c b/src/gallium/state_trackers/vdpau/mixer.c
>index 8476329..f9b413e 100644
>--- a/src/gallium/state_trackers/vdpau/mixer.c
>+++ b/src/gallium/state_trackers/vdpau/mixer.c
>@@ -768,22 +768,25 @@ vlVdpGenerateCSCMatrix(VdpProcamp *procamp,
>    enum VL_CSC_COLOR_STANDARD vl_std;
>    struct vl_procamp camp;
> 
>-   if (!(csc_matrix && procamp))
>+   if (!csc_matrix)
>       return VDP_STATUS_INVALID_POINTER;
> 
>-   if (procamp->struct_version > VDP_PROCAMP_VERSION)
>-      return VDP_STATUS_INVALID_STRUCT_VERSION;
>-
>    switch (standard) {
>       case VDP_COLOR_STANDARD_ITUR_BT_601: vl_std = VL_CSC_COLOR_STANDARD_BT_601; break;
>       case VDP_COLOR_STANDARD_ITUR_BT_709: vl_std = VL_CSC_COLOR_STANDARD_BT_709; break;
>       case VDP_COLOR_STANDARD_SMPTE_240M:  vl_std = VL_CSC_COLOR_STANDARD_SMPTE_240M; break;
>       default: return VDP_STATUS_INVALID_COLOR_STANDARD;
>    }
>-   camp.brightness = procamp->brightness;
>-   camp.contrast = procamp->contrast;
>-   camp.saturation = procamp->saturation;
>-   camp.hue = procamp->hue;
>-   vl_csc_get_matrix(vl_std, &camp, true, csc_matrix);
>+
>+   if (procamp) {
>+      if (procamp->struct_version > VDP_PROCAMP_VERSION)
>+         return VDP_STATUS_INVALID_STRUCT_VERSION;
>+      camp.brightness = procamp->brightness;
>+      camp.contrast = procamp->contrast;
>+      camp.saturation = procamp->saturation;
>+      camp.hue = procamp->hue;
>+   }
>+
>+   vl_csc_get_matrix(vl_std, procamp ? &camp : NULL, true, csc_matrix);
>    return VDP_STATUS_OK;
> }
>-- 
>1.8.1.2
>

Actions: View

Attachments on bug 68792: 84971 | 87182 | 87295 | 87417 | 87418 | 89448 | 89449

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.