Mesa (master): st/vdpau: use template size as default for source_rect.
Christian König
deathsimple at kemper.freedesktop.org
Wed Jun 20 08:13:57 UTC 2012
Module: Mesa
Branch: master
Commit: 0f269c5e7b593eb29d5c1058dcd53fc6476871a9
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=0f269c5e7b593eb29d5c1058dcd53fc6476871a9
Author: Christian König <deathsimple at vodafone.de>
Date: Thu Jun 14 17:52:20 2012 +0200
st/vdpau: use template size as default for source_rect.
Fixes alignment problems with flash player.
Signed-off-by: Christian König <deathsimple at vodafone.de>
---
src/gallium/state_trackers/vdpau/mixer.c | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/src/gallium/state_trackers/vdpau/mixer.c b/src/gallium/state_trackers/vdpau/mixer.c
index e3c9349..81a5c29 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 = ▭
+ }
+ 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) {
More information about the mesa-commit
mailing list