[PATCH] st/vdpau: Respect source_rect in VideoMixerRender
Christian König
deathsimple at vodafone.de
Sun Aug 28 04:52:44 PDT 2011
Fixing a bug reported by Andy Furniss.
---
src/gallium/state_trackers/vdpau/mixer.c | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 deletions(-)
diff --git a/src/gallium/state_trackers/vdpau/mixer.c b/src/gallium/state_trackers/vdpau/mixer.c
index fbd24a2..e74b241 100644
--- a/src/gallium/state_trackers/vdpau/mixer.c
+++ b/src/gallium/state_trackers/vdpau/mixer.c
@@ -139,6 +139,8 @@ VdpStatus vlVdpVideoMixerRender(VdpVideoMixer mixer,
uint32_t layer_count,
VdpLayer const *layers)
{
+ struct pipe_video_rect src_rect, *p_src_rect = NULL;
+
vlVdpVideoMixer *vmixer;
vlVdpSurface *surf;
vlVdpOutputSurface *dst;
@@ -154,9 +156,17 @@ VdpStatus vlVdpVideoMixerRender(VdpVideoMixer mixer,
dst = vlGetDataHTAB(destination_surface);
if (!dst)
return VDP_STATUS_INVALID_HANDLE;
+
+ if (video_source_rect) {
+ src_rect.x = MIN2(video_source_rect->x1, video_source_rect->x0);
+ src_rect.y = MIN2(video_source_rect->y1, video_source_rect->y0);
+ src_rect.w = abs(video_source_rect->x1 - video_source_rect->x0);
+ src_rect.h = abs(video_source_rect->y1 - video_source_rect->y0);
+ p_src_rect = &src_rect;
+ }
vl_compositor_clear_layers(&vmixer->compositor);
- vl_compositor_set_buffer_layer(&vmixer->compositor, 0, surf->video_buffer, NULL, NULL);
+ vl_compositor_set_buffer_layer(&vmixer->compositor, 0, surf->video_buffer, p_src_rect, NULL);
vl_compositor_render(&vmixer->compositor, dst->surface, NULL, NULL);
return VDP_STATUS_OK;
--
1.7.4.1
--=-FomzftvbangRcVkAt5BR--
More information about the mesa-dev
mailing list