mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2025-02-20 04:56:24 +00:00
gst/videocrop/: Some quick tests indicate that it doesn't make a great deal of sense to use liboil here, at least not...
Original commit message from CVS: * gst/videocrop/Makefile.am: * gst/videocrop/gstvideocrop.c: (gst_video_crop_class_init), (gst_video_crop_transform_packed), (gst_video_crop_transform_planar): Some quick tests indicate that it doesn't make a great deal of sense to use liboil here, at least not for the memcpy()s we do, so remove liboil usage until there is clear evidence it actually makes a positive difference somewhere.
This commit is contained in:
parent
4b7c760e11
commit
4b0fe48287
2 changed files with 6 additions and 9 deletions
|
@ -5,8 +5,8 @@ plugin_LTLIBRARIES = libgstvideocrop.la
|
||||||
|
|
||||||
libgstvideocrop_la_SOURCES = gstvideocrop.c
|
libgstvideocrop_la_SOURCES = gstvideocrop.c
|
||||||
libgstvideocrop_la_CFLAGS = $(GST_CFLAGS) $(GST_BASE_CFLAGS) \
|
libgstvideocrop_la_CFLAGS = $(GST_CFLAGS) $(GST_BASE_CFLAGS) \
|
||||||
$(GST_PLUGINS_BASE_CFLAGS) $(LIBOIL_CFLAGS)
|
$(GST_PLUGINS_BASE_CFLAGS)
|
||||||
libgstvideocrop_la_LIBADD = $(GST_BASE_LIBS) $(LIBOIL_LIBS)
|
libgstvideocrop_la_LIBADD = $(GST_BASE_LIBS)
|
||||||
libgstvideocrop_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
|
libgstvideocrop_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
|
||||||
|
|
||||||
noinst_HEADERS = gstvideocrop.h
|
noinst_HEADERS = gstvideocrop.h
|
||||||
|
|
|
@ -61,7 +61,6 @@
|
||||||
|
|
||||||
#include "gstvideocrop.h"
|
#include "gstvideocrop.h"
|
||||||
|
|
||||||
#include <liboil/liboil.h>
|
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
|
|
||||||
GST_DEBUG_CATEGORY_STATIC (videocrop_debug);
|
GST_DEBUG_CATEGORY_STATIC (videocrop_debug);
|
||||||
|
@ -178,8 +177,6 @@ gst_video_crop_class_init (GstVideoCropClass * klass)
|
||||||
GST_DEBUG_FUNCPTR (gst_video_crop_get_unit_size);
|
GST_DEBUG_FUNCPTR (gst_video_crop_get_unit_size);
|
||||||
|
|
||||||
basetransform_class->passthrough_on_same_caps = TRUE;
|
basetransform_class->passthrough_on_same_caps = TRUE;
|
||||||
|
|
||||||
oil_init ();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
|
@ -317,7 +314,7 @@ gst_video_crop_transform_packed (GstVideoCrop * vcrop, GstBuffer * inbuf,
|
||||||
dx = vcrop->out.width * vcrop->out.bytes_per_pixel;
|
dx = vcrop->out.width * vcrop->out.bytes_per_pixel;
|
||||||
|
|
||||||
for (i = 0; i < vcrop->out.height; ++i) {
|
for (i = 0; i < vcrop->out.height; ++i) {
|
||||||
oil_memcpy (out_data, in_data, dx);
|
memcpy (out_data, in_data, dx);
|
||||||
in_data += vcrop->in.stride;
|
in_data += vcrop->in.stride;
|
||||||
out_data += vcrop->out.stride;
|
out_data += vcrop->out.stride;
|
||||||
}
|
}
|
||||||
|
@ -339,7 +336,7 @@ gst_video_crop_transform_planar (GstVideoCrop * vcrop, GstBuffer * inbuf,
|
||||||
dx = vcrop->out.width * 1;
|
dx = vcrop->out.width * 1;
|
||||||
|
|
||||||
for (i = 0; i < vcrop->out.height; ++i) {
|
for (i = 0; i < vcrop->out.height; ++i) {
|
||||||
oil_memcpy (y_out, y_in, dx);
|
memcpy (y_out, y_in, dx);
|
||||||
y_in += vcrop->in.y_stride;
|
y_in += vcrop->in.y_stride;
|
||||||
y_out += vcrop->out.y_stride;
|
y_out += vcrop->out.y_stride;
|
||||||
}
|
}
|
||||||
|
@ -360,8 +357,8 @@ gst_video_crop_transform_planar (GstVideoCrop * vcrop, GstBuffer * inbuf,
|
||||||
dx = GST_ROUND_UP_2 (vcrop->out.width) / 2;
|
dx = GST_ROUND_UP_2 (vcrop->out.width) / 2;
|
||||||
|
|
||||||
for (i = 0; i < GST_ROUND_UP_2 (vcrop->out.height) / 2; ++i) {
|
for (i = 0; i < GST_ROUND_UP_2 (vcrop->out.height) / 2; ++i) {
|
||||||
oil_memcpy (u_out, u_in, dx);
|
memcpy (u_out, u_in, dx);
|
||||||
oil_memcpy (v_out, v_in, dx);
|
memcpy (v_out, v_in, dx);
|
||||||
u_in += vcrop->in.u_stride;
|
u_in += vcrop->in.u_stride;
|
||||||
u_out += vcrop->out.u_stride;
|
u_out += vcrop->out.u_stride;
|
||||||
v_in += vcrop->in.v_stride;
|
v_in += vcrop->in.v_stride;
|
||||||
|
|
Loading…
Reference in a new issue