From 57811331ded31f7ff051d98ed31c59e84e1045e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= Date: Thu, 27 Nov 2014 15:28:36 +0000 Subject: [PATCH] video-blend: make use of x offset when unpacking overlay image pixels Now that it's implemented we can use it, which is a minor optimisation when the image to overlay gets cropped on the left. --- gst-libs/gst/video/video-blend.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/gst-libs/gst/video/video-blend.c b/gst-libs/gst/video/video-blend.c index 7b180459fa..7a1380babe 100644 --- a/gst-libs/gst/video/video-blend.c +++ b/gst-libs/gst/video/video-blend.c @@ -365,11 +365,10 @@ gst_video_blend (GstVideoFrame * dest, dinfo->unpack_func (dinfo, 0, tmpdestline, dest->data, dest->info.stride, 0, i, dest_width); sinfo->unpack_func (sinfo, 0, tmpsrcline, src->data, src->info.stride, - 0, src_yoff, src_width + src_xoff); + src_xoff, src_yoff, src_width); /* FIXME: use the x parameter of the unpack func once implemented */ tmpdestline += 4 * x; - tmpsrcline += 4 * src_xoff; matrix (tmpsrcline, src_width); @@ -414,7 +413,6 @@ gst_video_blend (GstVideoFrame * dest, /* undo previous pointer adjustments to pass right pointer to g_free */ tmpdestline -= 4 * x; - tmpsrcline -= 4 * src_xoff; /* FIXME * #if G_BYTE_ORDER == LITTLE_ENDIAN