From: Christian König <deathsimple@vodafone.de>
Date: Thu, 14 Jun 2012 15:52:20 +0000 (+0200)
Subject: st/vdpau: use template size as default for source_rect.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=0f269c5e7b593eb29d5c1058dcd53fc6476871a9;p=mesa.git

st/vdpau: use template size as default for source_rect.

Fixes alignment problems with flash player.

Signed-off-by: Christian König <deathsimple@vodafone.de>
---

diff --git a/src/gallium/state_trackers/vdpau/mixer.c b/src/gallium/state_trackers/vdpau/mixer.c
index e3c9349bfc4..81a5c293685 100644
--- a/src/gallium/state_trackers/vdpau/mixer.c
+++ b/src/gallium/state_trackers/vdpau/mixer.c
@@ -216,7 +216,7 @@ VdpStatus vlVdpVideoMixerRender(VdpVideoMixer mixer,
                                 VdpLayer const *layers)
 {
    enum vl_compositor_deinterlace deinterlace;
-   struct u_rect rect, clip;
+   struct u_rect rect, clip, *prect;
    unsigned i, layer = 0;
 
    vlVdpVideoMixer *vmixer;
@@ -281,8 +281,15 @@ VdpStatus vlVdpVideoMixerRender(VdpVideoMixer mixer,
       pipe_mutex_unlock(vmixer->device->mutex);
       return VDP_STATUS_INVALID_VIDEO_MIXER_PICTURE_STRUCTURE;
    };
-   vl_compositor_set_buffer_layer(&vmixer->cstate, compositor, layer, surf->video_buffer,
-                                  RectToPipe(video_source_rect, &rect), NULL, deinterlace);
+   prect = RectToPipe(video_source_rect, &rect);
+   if (!prect) {
+      rect.x0 = 0;
+      rect.y0 = 0;
+      rect.x1 = surf->templat.width;
+      rect.y1 = surf->templat.height;
+      prect = &rect;
+   }
+   vl_compositor_set_buffer_layer(&vmixer->cstate, compositor, layer, surf->video_buffer, prect, NULL, deinterlace);
    vl_compositor_set_layer_dst_area(&vmixer->cstate, layer++, RectToPipe(destination_video_rect, &rect));
 
    for (i = 0; i < layer_count; ++i) {