From 621292e754e892940d0418f645ad486f0c0039b7 Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Wed, 25 Feb 2015 17:00:34 +0100 Subject: [PATCH] video-converter: we can use the scaler without scalers to copy --- gst-libs/gst/video/video-converter.c | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) diff --git a/gst-libs/gst/video/video-converter.c b/gst-libs/gst/video/video-converter.c index 08b8298812..7309cafb09 100644 --- a/gst-libs/gst/video/video-converter.c +++ b/gst-libs/gst/video/video-converter.c @@ -3567,23 +3567,6 @@ convert_plane_fill (GstVideoConverter * convert, convert->fout_width[plane], convert->fout_height[plane]); } -static void -convert_plane_copy (GstVideoConverter * convert, - const GstVideoFrame * src, GstVideoFrame * dest, gint plane) -{ - guint8 *s, *d; - gint splane = convert->fsplane[plane]; - - s = FRAME_GET_PLANE_LINE (src, splane, convert->fin_y[splane]); - s += convert->fin_x[splane]; - d = FRAME_GET_PLANE_LINE (dest, plane, convert->fout_y[plane]); - d += convert->fout_x[plane]; - - video_orc_memcpy_2d (d, FRAME_GET_PLANE_STRIDE (dest, plane), - s, FRAME_GET_PLANE_STRIDE (src, splane), - convert->fout_width[plane], convert->fout_height[plane]); -} - static void convert_plane_h_double (GstVideoConverter * convert, const GstVideoFrame * src, GstVideoFrame * dest, gint plane) @@ -4030,7 +4013,7 @@ setup_scale (GstVideoConverter * convert) need_h_scaler = FALSE; if (iw == ow) { if (ih == oh) { - convert->fconvert[i] = convert_plane_copy; + convert->fconvert[i] = convert_plane_hv; GST_DEBUG ("plane %d: copy", i); } else if (ih == 2 * oh && pstride == 1 && resample_method == GST_VIDEO_RESAMPLER_METHOD_LINEAR) {