X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=gst%2Fvideocrop%2Fgstvideocrop.c;h=8a89007d307a169dc4af6257ac2a8274a50c4e39;hb=01e1b181e893255512f473a6b0186b406b7ee940;hp=8654f90e166962b238c7de404f57401383589818;hpb=7749cd3f7b510e8d77f19a62545e375e39b70684;p=platform%2Fupstream%2Fgst-plugins-good.git
diff --git a/gst/videocrop/gstvideocrop.c b/gst/videocrop/gstvideocrop.c
index 8654f90..8a89007 100644
--- a/gst/videocrop/gstvideocrop.c
+++ b/gst/videocrop/gstvideocrop.c
@@ -13,8 +13,8 @@
*
* You should have received a copy of the GNU Library General Public
* License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
*/
/**
@@ -42,7 +42,7 @@
*
* Example launch line
* |[
- * gst-launch -v videotestsrc ! videocrop top=42 left=1 right=4 bottom=0 ! ximagesink
+ * gst-launch-1.0 -v videotestsrc ! videocrop top=42 left=1 right=4 bottom=0 ! ximagesink
* ]|
*
*/
@@ -70,17 +70,19 @@ GST_DEBUG_CATEGORY_STATIC (videocrop_debug);
enum
{
- ARG_0,
- ARG_LEFT,
- ARG_RIGHT,
- ARG_TOP,
- ARG_BOTTOM
+ PROP_0,
+ PROP_LEFT,
+ PROP_RIGHT,
+ PROP_TOP,
+ PROP_BOTTOM
};
+/* we support the same caps as aspectratiocrop (sync changes) */
#define VIDEO_CROP_CAPS \
GST_VIDEO_CAPS_MAKE ("{ RGBx, xRGB, BGRx, xBGR, " \
"RGBA, ARGB, BGRA, ABGR, RGB, BGR, AYUV, YUY2, " \
- "YVYU, UYVY, Y800, I420, RGB16, RGB15, GRAY8 }")
+ "YVYU, UYVY, I420, YV12, RGB16, RGB15, GRAY8, " \
+ "NV12, NV21, GRAY16_LE, GRAY16_BE }")
static GstStaticPadTemplate src_template = GST_STATIC_PAD_TEMPLATE ("src",
GST_PAD_SRC,
@@ -95,9 +97,7 @@ static GstStaticPadTemplate sink_template = GST_STATIC_PAD_TEMPLATE ("sink",
);
#define gst_video_crop_parent_class parent_class
-G_DEFINE_TYPE (GstVideoCrop, gst_video_crop, GST_TYPE_BASE_TRANSFORM);
-
-static void gst_video_crop_finalize (GObject * object);
+G_DEFINE_TYPE (GstVideoCrop, gst_video_crop, GST_TYPE_VIDEO_FILTER);
static void gst_video_crop_set_property (GObject * object, guint prop_id,
const GValue * value, GParamSpec * pspec);
@@ -106,15 +106,21 @@ static void gst_video_crop_get_property (GObject * object, guint prop_id,
static GstCaps *gst_video_crop_transform_caps (GstBaseTransform * trans,
GstPadDirection direction, GstCaps * caps, GstCaps * filter_caps);
-static GstFlowReturn gst_video_crop_transform (GstBaseTransform * trans,
- GstBuffer * inbuf, GstBuffer * outbuf);
-static gboolean gst_video_crop_get_unit_size (GstBaseTransform * trans,
- GstCaps * caps, gsize * size);
-static gboolean gst_video_crop_set_caps (GstBaseTransform * trans,
- GstCaps * in_caps, GstCaps * outcaps);
static gboolean gst_video_crop_src_event (GstBaseTransform * trans,
GstEvent * event);
+static gboolean gst_video_crop_set_info (GstVideoFilter * vfilter, GstCaps * in,
+ GstVideoInfo * in_info, GstCaps * out, GstVideoInfo * out_info);
+static GstFlowReturn gst_video_crop_transform_frame (GstVideoFilter * vfilter,
+ GstVideoFrame * in_frame, GstVideoFrame * out_frame);
+
+static gboolean gst_video_crop_decide_allocation (GstBaseTransform * trans,
+ GstQuery * query);
+static gboolean gst_video_crop_propose_allocation (GstBaseTransform * trans,
+ GstQuery * decide_query, GstQuery * query);
+static GstFlowReturn gst_video_crop_transform_ip (GstBaseTransform * trans,
+ GstBuffer * buf);
+
static gboolean
gst_video_crop_src_event (GstBaseTransform * trans, GstEvent * event)
{
@@ -168,46 +174,58 @@ gst_video_crop_class_init (GstVideoCropClass * klass)
GObjectClass *gobject_class;
GstElementClass *element_class;
GstBaseTransformClass *basetransform_class;
+ GstVideoFilterClass *vfilter_class;
gobject_class = (GObjectClass *) klass;
element_class = (GstElementClass *) klass;
basetransform_class = (GstBaseTransformClass *) klass;
+ vfilter_class = (GstVideoFilterClass *) klass;
- gobject_class->finalize = gst_video_crop_finalize;
gobject_class->set_property = gst_video_crop_set_property;
gobject_class->get_property = gst_video_crop_get_property;
- g_object_class_install_property (gobject_class, ARG_LEFT,
- g_param_spec_int ("left", "Left", "Pixels to crop at left",
- 0, G_MAXINT, 0, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
- g_object_class_install_property (gobject_class, ARG_RIGHT,
- g_param_spec_int ("right", "Right", "Pixels to crop at right",
- 0, G_MAXINT, 0, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
- g_object_class_install_property (gobject_class, ARG_TOP,
- g_param_spec_int ("top", "Top", "Pixels to crop at top",
- 0, G_MAXINT, 0, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
- g_object_class_install_property (gobject_class, ARG_BOTTOM,
- g_param_spec_int ("bottom", "Bottom", "Pixels to crop at bottom",
- 0, G_MAXINT, 0, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
-
- gst_element_class_add_pad_template (element_class,
- gst_static_pad_template_get (&sink_template));
- gst_element_class_add_pad_template (element_class,
- gst_static_pad_template_get (&src_template));
- gst_element_class_set_details_simple (element_class, "Crop",
+ g_object_class_install_property (gobject_class, PROP_LEFT,
+ g_param_spec_int ("left", "Left",
+ "Pixels to crop at left (-1 to auto-crop)", -1, G_MAXINT, 0,
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS |
+ GST_PARAM_MUTABLE_PLAYING));
+ g_object_class_install_property (gobject_class, PROP_RIGHT,
+ g_param_spec_int ("right", "Right",
+ "Pixels to crop at right (-1 to auto-crop)", -1, G_MAXINT, 0,
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS |
+ GST_PARAM_MUTABLE_PLAYING));
+ g_object_class_install_property (gobject_class, PROP_TOP,
+ g_param_spec_int ("top", "Top", "Pixels to crop at top (-1 to auto-crop)",
+ -1, G_MAXINT, 0,
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS |
+ GST_PARAM_MUTABLE_PLAYING));
+ g_object_class_install_property (gobject_class, PROP_BOTTOM,
+ g_param_spec_int ("bottom", "Bottom",
+ "Pixels to crop at bottom (-1 to auto-crop)", -1, G_MAXINT, 0,
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS |
+ GST_PARAM_MUTABLE_PLAYING));
+
+ gst_element_class_add_static_pad_template (element_class, &sink_template);
+ gst_element_class_add_static_pad_template (element_class, &src_template);
+ gst_element_class_set_static_metadata (element_class, "Crop",
"Filter/Effect/Video",
"Crops video into a user-defined region",
"Tim-Philipp Müller ");
- basetransform_class->transform = GST_DEBUG_FUNCPTR (gst_video_crop_transform);
+ basetransform_class->transform_ip_on_passthrough = FALSE;
basetransform_class->transform_caps =
GST_DEBUG_FUNCPTR (gst_video_crop_transform_caps);
- basetransform_class->set_caps = GST_DEBUG_FUNCPTR (gst_video_crop_set_caps);
- basetransform_class->get_unit_size =
- GST_DEBUG_FUNCPTR (gst_video_crop_get_unit_size);
-
- basetransform_class->passthrough_on_same_caps = FALSE;
basetransform_class->src_event = GST_DEBUG_FUNCPTR (gst_video_crop_src_event);
+ basetransform_class->decide_allocation =
+ GST_DEBUG_FUNCPTR (gst_video_crop_decide_allocation);
+ basetransform_class->propose_allocation =
+ GST_DEBUG_FUNCPTR (gst_video_crop_propose_allocation);
+ basetransform_class->transform_ip =
+ GST_DEBUG_FUNCPTR (gst_video_crop_transform_ip);
+
+ vfilter_class->set_info = GST_DEBUG_FUNCPTR (gst_video_crop_set_info);
+ vfilter_class->transform_frame =
+ GST_DEBUG_FUNCPTR (gst_video_crop_transform_frame);
}
static void
@@ -217,277 +235,313 @@ gst_video_crop_init (GstVideoCrop * vcrop)
vcrop->crop_left = 0;
vcrop->crop_top = 0;
vcrop->crop_bottom = 0;
-
- g_mutex_init (&vcrop->lock);
-}
-
-static void
-gst_video_crop_finalize (GObject * object)
-{
- GstVideoCrop *vcrop;
-
- vcrop = GST_VIDEO_CROP (object);
-
- g_mutex_clear (&vcrop->lock);
-
- G_OBJECT_CLASS (parent_class)->finalize (object);
-}
-
-static gboolean
-gst_video_crop_get_image_details_from_caps (GstVideoCrop * vcrop,
- GstVideoCropImageDetails * details, GstCaps * caps)
-{
- gst_video_info_init (&details->info);
- if (!gst_video_info_from_caps (&details->info, caps)) {
- goto incomplete_format;
- }
-
- if (details->info.width == 0 && details->info.height == 0) {
- goto incomplete_format;
- }
-
- if (GST_VIDEO_INFO_IS_RGB (&details->info)
- || GST_VIDEO_INFO_IS_GRAY (&details->info)) {
- details->packing = VIDEO_CROP_PIXEL_FORMAT_PACKED_SIMPLE;
- } else {
- switch (GST_VIDEO_INFO_FORMAT (&details->info)) {
- case GST_VIDEO_FORMAT_AYUV:
- details->packing = VIDEO_CROP_PIXEL_FORMAT_PACKED_SIMPLE;
- break;
- case GST_VIDEO_FORMAT_YVYU:
- case GST_VIDEO_FORMAT_YUY2:
- case GST_VIDEO_FORMAT_UYVY:
- details->packing = VIDEO_CROP_PIXEL_FORMAT_PACKED_COMPLEX;
- if (GST_VIDEO_INFO_FORMAT (&details->info) == GST_VIDEO_FORMAT_UYVY) {
- /* UYVY = 4:2:2 - [U0 Y0 V0 Y1] [U2 Y2 V2 Y3] [U4 Y4 V4 Y5] */
- details->macro_y_off = 1;
- } else {
- /* YUYV = 4:2:2 - [Y0 U0 Y1 V0] [Y2 U2 Y3 V2] [Y4 U4 Y5 V4] = YUY2 */
- details->macro_y_off = 0;
- }
- break;
- case GST_VIDEO_FORMAT_Y800:
- details->packing = VIDEO_CROP_PIXEL_FORMAT_PACKED_SIMPLE;
- break;
- case GST_VIDEO_FORMAT_I420:
- case GST_VIDEO_FORMAT_YV12:
- details->packing = VIDEO_CROP_PIXEL_FORMAT_PLANAR;
- break;
- default:
- goto unknown_format;
- }
- }
-
- return TRUE;
-
- /* ERRORS */
-unknown_format:
- {
- GST_ELEMENT_ERROR (vcrop, STREAM, NOT_IMPLEMENTED, (NULL),
- ("Unsupported format"));
- return FALSE;
- }
-
-incomplete_format:
- {
- GST_ELEMENT_ERROR (vcrop, CORE, NEGOTIATION, (NULL),
- ("Incomplete caps, some required field is missing"));
- return FALSE;
- }
-}
-
-static gboolean
-gst_video_crop_get_unit_size (GstBaseTransform * trans, GstCaps * caps,
- gsize * size)
-{
- GstVideoCropImageDetails img_details = { 0, };
- GstVideoCrop *vcrop = GST_VIDEO_CROP (trans);
-
- if (!gst_video_crop_get_image_details_from_caps (vcrop, &img_details, caps))
- return FALSE;
-
- *size = GST_VIDEO_INFO_SIZE (&img_details.info);
- return TRUE;
}
#define ROUND_DOWN_2(n) ((n)&(~1))
static void
gst_video_crop_transform_packed_complex (GstVideoCrop * vcrop,
- GstBuffer * inbuf, GstBuffer * outbuf)
+ GstVideoFrame * in_frame, GstVideoFrame * out_frame, gint x, gint y)
{
- GstMapInfo in_map, out_map;
guint8 *in_data, *out_data;
guint i, dx;
+ gint width, height;
gint in_stride;
gint out_stride;
- gst_buffer_map (inbuf, &in_map, GST_MAP_READ);
- gst_buffer_map (outbuf, &out_map, GST_MAP_WRITE);
+ width = GST_VIDEO_FRAME_WIDTH (out_frame);
+ height = GST_VIDEO_FRAME_HEIGHT (out_frame);
- in_data = in_map.data;
- out_data = out_map.data;
+ in_data = GST_VIDEO_FRAME_PLANE_DATA (in_frame, 0);
+ out_data = GST_VIDEO_FRAME_PLANE_DATA (out_frame, 0);
- in_stride = GST_VIDEO_INFO_PLANE_STRIDE (&vcrop->in.info, 0);
- out_stride = GST_VIDEO_INFO_PLANE_STRIDE (&vcrop->out.info, 0);
+ in_stride = GST_VIDEO_FRAME_PLANE_STRIDE (in_frame, 0);
+ out_stride = GST_VIDEO_FRAME_PLANE_STRIDE (out_frame, 0);
in_data += vcrop->crop_top * in_stride;
/* rounding down here so we end up at the start of a macro-pixel and not
* in the middle of one */
- in_data +=
- ROUND_DOWN_2 (vcrop->crop_left) *
- GST_VIDEO_INFO_COMP_PSTRIDE (&vcrop->in.info, 0);
+ in_data += ROUND_DOWN_2 (vcrop->crop_left) *
+ GST_VIDEO_FRAME_COMP_PSTRIDE (in_frame, 0);
- dx = GST_VIDEO_INFO_WIDTH (&vcrop->out.info) *
- GST_VIDEO_INFO_COMP_PSTRIDE (&vcrop->out.info, 0);
+ dx = width * GST_VIDEO_FRAME_COMP_PSTRIDE (out_frame, 0);
/* UYVY = 4:2:2 - [U0 Y0 V0 Y1] [U2 Y2 V2 Y3] [U4 Y4 V4 Y5]
* YUYV = 4:2:2 - [Y0 U0 Y1 V0] [Y2 U2 Y3 V2] [Y4 U4 Y5 V4] = YUY2 */
if ((vcrop->crop_left % 2) != 0) {
- for (i = 0; i < GST_VIDEO_INFO_HEIGHT (&vcrop->out.info); ++i) {
+ for (i = 0; i < height; ++i) {
gint j;
memcpy (out_data, in_data, dx);
/* move just the Y samples one pixel to the left, don't worry about
* chroma shift */
- for (j = vcrop->in.macro_y_off; j < out_stride - 2; j += 2)
+ for (j = vcrop->macro_y_off; j < out_stride - 2; j += 2)
out_data[j] = in_data[j + 2];
in_data += in_stride;
out_data += out_stride;
}
} else {
- for (i = 0; i < GST_VIDEO_INFO_HEIGHT (&vcrop->out.info); ++i) {
+ for (i = 0; i < height; ++i) {
memcpy (out_data, in_data, dx);
in_data += in_stride;
out_data += out_stride;
}
}
- gst_buffer_unmap (inbuf, &in_map);
- gst_buffer_unmap (outbuf, &out_map);
}
static void
gst_video_crop_transform_packed_simple (GstVideoCrop * vcrop,
- GstBuffer * inbuf, GstBuffer * outbuf)
+ GstVideoFrame * in_frame, GstVideoFrame * out_frame, gint x, gint y)
{
- GstMapInfo in_map, out_map;
guint8 *in_data, *out_data;
+ gint width, height;
guint i, dx;
gint in_stride, out_stride;
- gst_buffer_map (inbuf, &in_map, GST_MAP_READ);
- gst_buffer_map (outbuf, &out_map, GST_MAP_WRITE);
+ width = GST_VIDEO_FRAME_WIDTH (out_frame);
+ height = GST_VIDEO_FRAME_HEIGHT (out_frame);
- in_data = in_map.data;
- out_data = out_map.data;
+ in_data = GST_VIDEO_FRAME_PLANE_DATA (in_frame, 0);
+ out_data = GST_VIDEO_FRAME_PLANE_DATA (out_frame, 0);
- in_stride = GST_VIDEO_INFO_PLANE_STRIDE (&vcrop->in.info, 0);
- out_stride = GST_VIDEO_INFO_PLANE_STRIDE (&vcrop->out.info, 0);
+ in_stride = GST_VIDEO_FRAME_PLANE_STRIDE (in_frame, 0);
+ out_stride = GST_VIDEO_FRAME_PLANE_STRIDE (out_frame, 0);
- in_data += vcrop->crop_top * in_stride;
+ in_data += (vcrop->crop_top + y) * in_stride;
in_data +=
- vcrop->crop_left * GST_VIDEO_INFO_COMP_PSTRIDE (&vcrop->in.info, 0);
+ (vcrop->crop_left + x) * GST_VIDEO_FRAME_COMP_PSTRIDE (in_frame, 0);
- dx = GST_VIDEO_INFO_WIDTH (&vcrop->out.info) *
- GST_VIDEO_INFO_COMP_PSTRIDE (&vcrop->out.info, 0);
+ dx = width * GST_VIDEO_FRAME_COMP_PSTRIDE (out_frame, 0);
- for (i = 0; i < GST_VIDEO_INFO_HEIGHT (&vcrop->out.info); ++i) {
+ for (i = 0; i < height; ++i) {
memcpy (out_data, in_data, dx);
in_data += in_stride;
out_data += out_stride;
}
- gst_buffer_unmap (inbuf, &in_map);
- gst_buffer_unmap (outbuf, &out_map);
}
static void
-gst_video_crop_transform_planar (GstVideoCrop * vcrop, GstBuffer * inbuf,
- GstBuffer * outbuf)
+gst_video_crop_transform_planar (GstVideoCrop * vcrop,
+ GstVideoFrame * in_frame, GstVideoFrame * out_frame, gint x, gint y)
{
- GstMapInfo in_map, out_map;
+ gint width, height;
+ gint crop_top, crop_left;
guint8 *y_out, *u_out, *v_out;
guint8 *y_in, *u_in, *v_in;
guint i, dx;
- gst_buffer_map (inbuf, &in_map, GST_MAP_READ);
- gst_buffer_map (outbuf, &out_map, GST_MAP_WRITE);
+ width = GST_VIDEO_FRAME_WIDTH (out_frame);
+ height = GST_VIDEO_FRAME_HEIGHT (out_frame);
+ crop_left = vcrop->crop_left + x;
+ crop_top = vcrop->crop_top + y;
/* Y plane */
- y_in = in_map.data;
- y_out = out_map.data;
+ y_in = GST_VIDEO_FRAME_PLANE_DATA (in_frame, 0);
+ y_out = GST_VIDEO_FRAME_PLANE_DATA (out_frame, 0);
- y_in +=
- (vcrop->crop_top * GST_VIDEO_INFO_PLANE_STRIDE (&vcrop->in.info,
- 0)) + vcrop->crop_left;
- dx = GST_VIDEO_INFO_WIDTH (&vcrop->out.info) * 1;
+ y_in += (crop_top * GST_VIDEO_FRAME_PLANE_STRIDE (in_frame, 0)) + crop_left;
+ dx = width;
- for (i = 0; i < GST_VIDEO_INFO_HEIGHT (&vcrop->out.info); ++i) {
+ for (i = 0; i < height; ++i) {
memcpy (y_out, y_in, dx);
- y_in += GST_VIDEO_INFO_PLANE_STRIDE (&vcrop->in.info, 0);
- y_out += GST_VIDEO_INFO_PLANE_STRIDE (&vcrop->out.info, 0);
+ y_in += GST_VIDEO_FRAME_PLANE_STRIDE (in_frame, 0);
+ y_out += GST_VIDEO_FRAME_PLANE_STRIDE (out_frame, 0);
}
/* U + V planes */
- u_in =
- (guint8 *) in_map.data + GST_VIDEO_INFO_PLANE_OFFSET (&vcrop->in.info, 1);
- u_out =
- (guint8 *) out_map.data + GST_VIDEO_INFO_PLANE_OFFSET (&vcrop->out.info,
- 1);
-
- u_in +=
- (vcrop->crop_top / 2) * GST_VIDEO_INFO_PLANE_STRIDE (&vcrop->in.info, 1);
- u_in += vcrop->crop_left / 2;
-
- v_in =
- (guint8 *) in_map.data + GST_VIDEO_INFO_PLANE_OFFSET (&vcrop->in.info, 2);
- v_out =
- (guint8 *) out_map.data + GST_VIDEO_INFO_PLANE_OFFSET (&vcrop->out.info,
- 2);
-
- v_in +=
- (vcrop->crop_top / 2) * GST_VIDEO_INFO_PLANE_STRIDE (&vcrop->in.info, 2);
- v_in += vcrop->crop_left / 2;
-
- dx = GST_ROUND_UP_2 (GST_VIDEO_INFO_WIDTH (&vcrop->out.info)) / 2;
-
- for (i = 0; i < GST_ROUND_UP_2 (GST_VIDEO_INFO_HEIGHT (&vcrop->out.info)) / 2;
- ++i) {
+ u_in = GST_VIDEO_FRAME_PLANE_DATA (in_frame, 1);
+ u_out = GST_VIDEO_FRAME_PLANE_DATA (out_frame, 1);
+
+ u_in += (crop_top / 2) * GST_VIDEO_FRAME_PLANE_STRIDE (in_frame, 1);
+ u_in += crop_left / 2;
+
+ v_in = GST_VIDEO_FRAME_PLANE_DATA (in_frame, 2);
+ v_out = GST_VIDEO_FRAME_PLANE_DATA (out_frame, 2);
+
+ v_in += (crop_top / 2) * GST_VIDEO_FRAME_PLANE_STRIDE (in_frame, 2);
+ v_in += crop_left / 2;
+
+ dx = GST_ROUND_UP_2 (width) / 2;
+
+ for (i = 0; i < GST_ROUND_UP_2 (height) / 2; ++i) {
memcpy (u_out, u_in, dx);
memcpy (v_out, v_in, dx);
- u_in += GST_VIDEO_INFO_PLANE_STRIDE (&vcrop->in.info, 1);
- u_out += GST_VIDEO_INFO_PLANE_STRIDE (&vcrop->out.info, 1);
- v_in += GST_VIDEO_INFO_PLANE_STRIDE (&vcrop->in.info, 2);
- v_out += GST_VIDEO_INFO_PLANE_STRIDE (&vcrop->out.info, 2);
+ u_in += GST_VIDEO_FRAME_PLANE_STRIDE (in_frame, 1);
+ u_out += GST_VIDEO_FRAME_PLANE_STRIDE (out_frame, 1);
+ v_in += GST_VIDEO_FRAME_PLANE_STRIDE (in_frame, 2);
+ v_out += GST_VIDEO_FRAME_PLANE_STRIDE (out_frame, 2);
}
+}
- gst_buffer_unmap (inbuf, &in_map);
- gst_buffer_unmap (outbuf, &out_map);
+static void
+gst_video_crop_transform_semi_planar (GstVideoCrop * vcrop,
+ GstVideoFrame * in_frame, GstVideoFrame * out_frame, gint x, gint y)
+{
+ gint width, height;
+ gint crop_top, crop_left;
+ guint8 *y_out, *uv_out;
+ guint8 *y_in, *uv_in;
+ guint i, dx;
+
+ width = GST_VIDEO_FRAME_WIDTH (out_frame);
+ height = GST_VIDEO_FRAME_HEIGHT (out_frame);
+ crop_left = vcrop->crop_left + x;
+ crop_top = vcrop->crop_top + y;
+
+ /* Y plane */
+ y_in = GST_VIDEO_FRAME_PLANE_DATA (in_frame, 0);
+ y_out = GST_VIDEO_FRAME_PLANE_DATA (out_frame, 0);
+
+ /* UV plane */
+ uv_in = GST_VIDEO_FRAME_PLANE_DATA (in_frame, 1);
+ uv_out = GST_VIDEO_FRAME_PLANE_DATA (out_frame, 1);
+
+ y_in += crop_top * GST_VIDEO_FRAME_PLANE_STRIDE (in_frame, 0) + crop_left;
+ dx = width;
+
+ for (i = 0; i < height; ++i) {
+ memcpy (y_out, y_in, dx);
+ y_in += GST_VIDEO_FRAME_PLANE_STRIDE (in_frame, 0);
+ y_out += GST_VIDEO_FRAME_PLANE_STRIDE (out_frame, 0);
+ }
+
+ uv_in += (crop_top / 2) * GST_VIDEO_FRAME_PLANE_STRIDE (in_frame, 1);
+ uv_in += GST_ROUND_DOWN_2 (crop_left);
+ dx = GST_ROUND_UP_2 (width);
+
+ for (i = 0; i < GST_ROUND_UP_2 (height) / 2; i++) {
+ memcpy (uv_out, uv_in, dx);
+ uv_in += GST_VIDEO_FRAME_PLANE_STRIDE (in_frame, 1);
+ uv_out += GST_VIDEO_FRAME_PLANE_STRIDE (out_frame, 1);
+ }
}
static GstFlowReturn
-gst_video_crop_transform (GstBaseTransform * trans, GstBuffer * inbuf,
- GstBuffer * outbuf)
+gst_video_crop_transform_frame (GstVideoFilter * vfilter,
+ GstVideoFrame * in_frame, GstVideoFrame * out_frame)
{
- GstVideoCrop *vcrop = GST_VIDEO_CROP (trans);
+ GstVideoCrop *vcrop = GST_VIDEO_CROP (vfilter);
+ GstVideoCropMeta *meta = gst_buffer_get_video_crop_meta (in_frame->buffer);
+ gint x = 0, y = 0;
+
+ if (G_UNLIKELY (vcrop->need_update)) {
+ if (!gst_video_crop_set_info (vfilter, NULL, &vcrop->in_info, NULL,
+ &vcrop->out_info)) {
+ return GST_FLOW_ERROR;
+ }
+ }
- g_mutex_lock (&vcrop->lock);
- switch (vcrop->in.packing) {
+ if (meta) {
+ x = meta->x;
+ y = meta->y;
+ }
+
+ switch (vcrop->packing) {
case VIDEO_CROP_PIXEL_FORMAT_PACKED_SIMPLE:
- gst_video_crop_transform_packed_simple (vcrop, inbuf, outbuf);
+ gst_video_crop_transform_packed_simple (vcrop, in_frame, out_frame, x, y);
break;
case VIDEO_CROP_PIXEL_FORMAT_PACKED_COMPLEX:
- gst_video_crop_transform_packed_complex (vcrop, inbuf, outbuf);
+ gst_video_crop_transform_packed_complex (vcrop, in_frame, out_frame, x,
+ y);
break;
case VIDEO_CROP_PIXEL_FORMAT_PLANAR:
- gst_video_crop_transform_planar (vcrop, inbuf, outbuf);
+ gst_video_crop_transform_planar (vcrop, in_frame, out_frame, x, y);
+ break;
+ case VIDEO_CROP_PIXEL_FORMAT_SEMI_PLANAR:
+ gst_video_crop_transform_semi_planar (vcrop, in_frame, out_frame, x, y);
break;
default:
g_assert_not_reached ();
}
- g_mutex_unlock (&vcrop->lock);
+
+ return GST_FLOW_OK;
+}
+
+static gboolean
+gst_video_crop_decide_allocation (GstBaseTransform * trans, GstQuery * query)
+{
+ GstVideoCrop *crop = GST_VIDEO_CROP (trans);
+ gboolean use_crop_meta;
+
+ use_crop_meta = (gst_query_find_allocation_meta (query,
+ GST_VIDEO_CROP_META_API_TYPE, NULL) &&
+ gst_query_find_allocation_meta (query, GST_VIDEO_META_API_TYPE, NULL));
+
+ if ((crop->crop_left | crop->crop_right | crop->crop_top | crop->
+ crop_bottom) == 0) {
+ GST_INFO_OBJECT (crop, "we are using passthrough");
+ gst_base_transform_set_passthrough (GST_BASE_TRANSFORM (crop), TRUE);
+ gst_base_transform_set_in_place (GST_BASE_TRANSFORM (crop), FALSE);
+ } else if (use_crop_meta) {
+ GST_INFO_OBJECT (crop, "we are doing in-place transform using crop meta");
+ gst_base_transform_set_passthrough (GST_BASE_TRANSFORM (crop), FALSE);
+ gst_base_transform_set_in_place (GST_BASE_TRANSFORM (crop), TRUE);
+ } else {
+ GST_INFO_OBJECT (crop, "we are not using passthrough");
+ gst_base_transform_set_passthrough (GST_BASE_TRANSFORM (crop), FALSE);
+ gst_base_transform_set_in_place (GST_BASE_TRANSFORM (crop), FALSE);
+ }
+
+ return GST_BASE_TRANSFORM_CLASS (parent_class)->decide_allocation (trans,
+ query);
+}
+
+static gboolean
+gst_video_crop_propose_allocation (GstBaseTransform * trans,
+ GstQuery * decide_query, GstQuery * query)
+{
+ /* if we are not passthrough, we can handle video meta and crop meta */
+ if (decide_query) {
+ GST_DEBUG_OBJECT (trans, "Advertising video meta and crop meta support");
+ gst_query_add_allocation_meta (query, GST_VIDEO_META_API_TYPE, NULL);
+ gst_query_add_allocation_meta (query, GST_VIDEO_CROP_META_API_TYPE, NULL);
+ }
+
+ return GST_BASE_TRANSFORM_CLASS (parent_class)->propose_allocation (trans,
+ decide_query, query);
+}
+
+static GstFlowReturn
+gst_video_crop_transform_ip (GstBaseTransform * trans, GstBuffer * buf)
+{
+ GstVideoCrop *vcrop = GST_VIDEO_CROP (trans);
+ GstVideoFilter *vfilter = GST_VIDEO_FILTER (trans);
+ GstVideoMeta *video_meta;
+ GstVideoCropMeta *crop_meta;
+
+ GST_LOG_OBJECT (trans, "Transforming in-place");
+
+ if (G_UNLIKELY (vcrop->need_update)) {
+ if (!gst_video_crop_set_info (vfilter, NULL, &vcrop->in_info, NULL,
+ &vcrop->out_info)) {
+ return GST_FLOW_ERROR;
+ }
+ }
+
+ /* The video meta is required since we are going to make the caps
+ * width/height smaller, which would not result in a usable GstVideoInfo for
+ * mapping the buffer. */
+ video_meta = gst_buffer_get_video_meta (buf);
+ if (!video_meta) {
+ video_meta = gst_buffer_add_video_meta (buf, GST_VIDEO_FRAME_FLAG_NONE,
+ GST_VIDEO_INFO_FORMAT (&vcrop->in_info), vcrop->in_info.width,
+ vcrop->in_info.height);
+ }
+
+ crop_meta = gst_buffer_get_video_crop_meta (buf);
+ if (!crop_meta) {
+ crop_meta = gst_buffer_add_video_crop_meta (buf);
+ crop_meta->width = vcrop->in_info.width;
+ crop_meta->height = vcrop->in_info.height;
+ }
+
+ crop_meta->x += vcrop->crop_left;
+ crop_meta->y += vcrop->crop_top;
+ crop_meta->width = GST_VIDEO_INFO_WIDTH (&vcrop->out_info);
+ crop_meta->height = GST_VIDEO_INFO_HEIGHT (&vcrop->out_info);
return GST_FLOW_OK;
}
@@ -504,33 +558,69 @@ gst_video_crop_transform_dimension (gint val, gint delta)
static gboolean
gst_video_crop_transform_dimension_value (const GValue * src_val,
- gint delta, GValue * dest_val)
+ gint delta, GValue * dest_val, GstPadDirection direction, gboolean dynamic)
{
gboolean ret = TRUE;
- g_value_init (dest_val, G_VALUE_TYPE (src_val));
-
if (G_VALUE_HOLDS_INT (src_val)) {
gint ival = g_value_get_int (src_val);
-
ival = gst_video_crop_transform_dimension (ival, delta);
- g_value_set_int (dest_val, ival);
+
+ if (dynamic) {
+ if (direction == GST_PAD_SRC) {
+ if (ival == G_MAXINT) {
+ g_value_init (dest_val, G_TYPE_INT);
+ g_value_set_int (dest_val, ival);
+ } else {
+ g_value_init (dest_val, GST_TYPE_INT_RANGE);
+ gst_value_set_int_range (dest_val, ival, G_MAXINT);
+ }
+ } else {
+ if (ival == 1) {
+ g_value_init (dest_val, G_TYPE_INT);
+ g_value_set_int (dest_val, ival);
+ } else {
+ g_value_init (dest_val, GST_TYPE_INT_RANGE);
+ gst_value_set_int_range (dest_val, 1, ival);
+ }
+ }
+ } else {
+ g_value_init (dest_val, G_TYPE_INT);
+ g_value_set_int (dest_val, ival);
+ }
} else if (GST_VALUE_HOLDS_INT_RANGE (src_val)) {
gint min = gst_value_get_int_range_min (src_val);
gint max = gst_value_get_int_range_max (src_val);
min = gst_video_crop_transform_dimension (min, delta);
max = gst_video_crop_transform_dimension (max, delta);
- gst_value_set_int_range (dest_val, min, max);
+
+ if (dynamic) {
+ if (direction == GST_PAD_SRC)
+ max = G_MAXINT;
+ else
+ min = 1;
+ }
+
+ if (min == max) {
+ g_value_init (dest_val, G_TYPE_INT);
+ g_value_set_int (dest_val, min);
+ } else {
+ g_value_init (dest_val, GST_TYPE_INT_RANGE);
+ gst_value_set_int_range (dest_val, min, max);
+ }
} else if (GST_VALUE_HOLDS_LIST (src_val)) {
gint i;
+ g_value_init (dest_val, GST_TYPE_LIST);
+
for (i = 0; i < gst_value_list_get_size (src_val); ++i) {
const GValue *list_val;
GValue newval = { 0, };
list_val = gst_value_list_get_value (src_val, i);
- if (gst_video_crop_transform_dimension_value (list_val, delta, &newval))
+ if (gst_video_crop_transform_dimension_value (list_val, delta, &newval,
+ direction, dynamic))
gst_value_list_append_value (dest_val, &newval);
g_value_unset (&newval);
}
@@ -540,37 +630,45 @@ gst_video_crop_transform_dimension_value (const GValue * src_val,
ret = FALSE;
}
} else {
- g_value_unset (dest_val);
ret = FALSE;
}
return ret;
}
-/* TODO use filter_caps */
static GstCaps *
gst_video_crop_transform_caps (GstBaseTransform * trans,
GstPadDirection direction, GstCaps * caps, GstCaps * filter_caps)
{
GstVideoCrop *vcrop;
GstCaps *other_caps;
- gint dy, dx, i;
+ gint dy, dx, i, left, right, bottom, top;
+ gboolean w_dynamic, h_dynamic;
vcrop = GST_VIDEO_CROP (trans);
GST_OBJECT_LOCK (vcrop);
GST_LOG_OBJECT (vcrop, "l=%d,r=%d,b=%d,t=%d",
- vcrop->crop_left, vcrop->crop_right, vcrop->crop_bottom, vcrop->crop_top);
+ vcrop->prop_left, vcrop->prop_right, vcrop->prop_bottom, vcrop->prop_top);
+
+ w_dynamic = (vcrop->prop_left == -1 || vcrop->prop_right == -1);
+ h_dynamic = (vcrop->prop_top == -1 || vcrop->prop_bottom == -1);
+
+ left = (vcrop->prop_left == -1) ? 0 : vcrop->prop_left;
+ right = (vcrop->prop_right == -1) ? 0 : vcrop->prop_right;
+ bottom = (vcrop->prop_bottom == -1) ? 0 : vcrop->prop_bottom;
+ top = (vcrop->prop_top == -1) ? 0 : vcrop->prop_top;
+
+ GST_OBJECT_UNLOCK (vcrop);
if (direction == GST_PAD_SRC) {
- dx = vcrop->crop_left + vcrop->crop_right;
- dy = vcrop->crop_top + vcrop->crop_bottom;
+ dx = left + right;
+ dy = top + bottom;
} else {
- dx = 0 - (vcrop->crop_left + vcrop->crop_right);
- dy = 0 - (vcrop->crop_top + vcrop->crop_bottom);
+ dx = 0 - (left + right);
+ dy = 0 - (top + bottom);
}
- GST_OBJECT_UNLOCK (vcrop);
GST_LOG_OBJECT (vcrop, "transforming caps %" GST_PTR_FORMAT, caps);
@@ -585,14 +683,16 @@ gst_video_crop_transform_caps (GstBaseTransform * trans,
structure = gst_caps_get_structure (caps, i);
v = gst_structure_get_value (structure, "width");
- if (!gst_video_crop_transform_dimension_value (v, dx, &w_val)) {
+ if (!gst_video_crop_transform_dimension_value (v, dx, &w_val, direction,
+ w_dynamic)) {
GST_WARNING_OBJECT (vcrop, "could not tranform width value with dx=%d"
", caps structure=%" GST_PTR_FORMAT, dx, structure);
continue;
}
v = gst_structure_get_value (structure, "height");
- if (!gst_video_crop_transform_dimension_value (v, dy, &h_val)) {
+ if (!gst_video_crop_transform_dimension_value (v, dy, &h_val, direction,
+ h_dynamic)) {
g_value_unset (&w_val);
GST_WARNING_OBJECT (vcrop, "could not tranform height value with dy=%d"
", caps structure=%" GST_PTR_FORMAT, dy, structure);
@@ -609,12 +709,7 @@ gst_video_crop_transform_caps (GstBaseTransform * trans,
gst_caps_append_structure (other_caps, new_structure);
}
- if (gst_caps_is_empty (other_caps)) {
- gst_caps_unref (other_caps);
- other_caps = NULL;
- }
-
- if (other_caps && filter_caps) {
+ if (!gst_caps_is_empty (other_caps) && filter_caps) {
GstCaps *tmp = gst_caps_intersect_full (filter_caps, other_caps,
GST_CAPS_INTERSECT_FIRST);
gst_caps_replace (&other_caps, tmp);
@@ -625,54 +720,121 @@ gst_video_crop_transform_caps (GstBaseTransform * trans,
}
static gboolean
-gst_video_crop_set_caps (GstBaseTransform * trans, GstCaps * incaps,
- GstCaps * outcaps)
+gst_video_crop_set_info (GstVideoFilter * vfilter, GstCaps * in,
+ GstVideoInfo * in_info, GstCaps * out, GstVideoInfo * out_info)
{
- GstVideoCrop *crop = GST_VIDEO_CROP (trans);
-
- if (!gst_video_crop_get_image_details_from_caps (crop, &crop->in, incaps))
- goto wrong_input;
+ GstVideoCrop *crop = GST_VIDEO_CROP (vfilter);
+ int dx, dy;
+
+ GST_OBJECT_LOCK (crop);
+ crop->need_update = FALSE;
+ crop->crop_left = crop->prop_left;
+ crop->crop_right = crop->prop_right;
+ crop->crop_top = crop->prop_top;
+ crop->crop_bottom = crop->prop_bottom;
+ GST_OBJECT_UNLOCK (crop);
+
+ dx = GST_VIDEO_INFO_WIDTH (in_info) - GST_VIDEO_INFO_WIDTH (out_info);
+ dy = GST_VIDEO_INFO_HEIGHT (in_info) - GST_VIDEO_INFO_HEIGHT (out_info);
+
+ if (crop->crop_left == -1 && crop->crop_right == -1) {
+ crop->crop_left = dx / 2;
+ crop->crop_right = dx / 2 + (dx & 1);
+ } else if (crop->crop_left == -1) {
+ if (G_UNLIKELY (crop->crop_right > dx))
+ goto cropping_too_much;
+ crop->crop_left = dx - crop->crop_right;
+ } else if (crop->crop_right == -1) {
+ if (G_UNLIKELY (crop->crop_left > dx))
+ goto cropping_too_much;
+ crop->crop_right = dx - crop->crop_left;
+ }
- if (!gst_video_crop_get_image_details_from_caps (crop, &crop->out, outcaps))
- goto wrong_output;
+ if (crop->crop_top == -1 && crop->crop_bottom == -1) {
+ crop->crop_top = dy / 2;
+ crop->crop_bottom = dy / 2 + (dy & 1);
+ } else if (crop->crop_top == -1) {
+ if (G_UNLIKELY (crop->crop_bottom > dy))
+ goto cropping_too_much;
+ crop->crop_top = dy - crop->crop_bottom;
+ } else if (crop->crop_bottom == -1) {
+ if (G_UNLIKELY (crop->crop_top > dy))
+ goto cropping_too_much;
+ crop->crop_bottom = dy - crop->crop_top;
+ }
if (G_UNLIKELY ((crop->crop_left + crop->crop_right) >=
- GST_VIDEO_INFO_WIDTH (&crop->in.info)
+ GST_VIDEO_INFO_WIDTH (in_info)
|| (crop->crop_top + crop->crop_bottom) >=
- GST_VIDEO_INFO_HEIGHT (&crop->in.info)))
+ GST_VIDEO_INFO_HEIGHT (in_info)))
goto cropping_too_much;
- GST_LOG_OBJECT (crop, "incaps = %" GST_PTR_FORMAT ", outcaps = %"
- GST_PTR_FORMAT, incaps, outcaps);
+ if (in && out)
+ GST_LOG_OBJECT (crop, "incaps = %" GST_PTR_FORMAT ", outcaps = %"
+ GST_PTR_FORMAT, in, out);
- if ((crop->crop_left | crop->crop_right | crop->
- crop_top | crop->crop_bottom) == 0) {
- GST_LOG_OBJECT (crop, "we are using passthrough");
- gst_base_transform_set_passthrough (GST_BASE_TRANSFORM (crop), TRUE);
+ if (GST_VIDEO_INFO_IS_RGB (in_info)
+ || GST_VIDEO_INFO_IS_GRAY (in_info)) {
+ crop->packing = VIDEO_CROP_PIXEL_FORMAT_PACKED_SIMPLE;
} else {
- GST_LOG_OBJECT (crop, "we are not using passthrough");
- gst_base_transform_set_passthrough (GST_BASE_TRANSFORM (crop), FALSE);
+ switch (GST_VIDEO_INFO_FORMAT (in_info)) {
+ case GST_VIDEO_FORMAT_AYUV:
+ crop->packing = VIDEO_CROP_PIXEL_FORMAT_PACKED_SIMPLE;
+ break;
+ case GST_VIDEO_FORMAT_YVYU:
+ case GST_VIDEO_FORMAT_YUY2:
+ case GST_VIDEO_FORMAT_UYVY:
+ crop->packing = VIDEO_CROP_PIXEL_FORMAT_PACKED_COMPLEX;
+ if (GST_VIDEO_INFO_FORMAT (in_info) == GST_VIDEO_FORMAT_UYVY) {
+ /* UYVY = 4:2:2 - [U0 Y0 V0 Y1] [U2 Y2 V2 Y3] [U4 Y4 V4 Y5] */
+ crop->macro_y_off = 1;
+ } else {
+ /* YUYV = 4:2:2 - [Y0 U0 Y1 V0] [Y2 U2 Y3 V2] [Y4 U4 Y5 V4] = YUY2 */
+ crop->macro_y_off = 0;
+ }
+ break;
+ case GST_VIDEO_FORMAT_I420:
+ case GST_VIDEO_FORMAT_YV12:
+ crop->packing = VIDEO_CROP_PIXEL_FORMAT_PLANAR;
+ break;
+ case GST_VIDEO_FORMAT_NV12:
+ case GST_VIDEO_FORMAT_NV21:
+ crop->packing = VIDEO_CROP_PIXEL_FORMAT_SEMI_PLANAR;
+ break;
+ default:
+ goto unknown_format;
+ }
}
+ crop->in_info = *in_info;
+ crop->out_info = *out_info;
+
+ /* Ensure our decide_allocation will be called again */
+ gst_base_transform_set_passthrough (GST_BASE_TRANSFORM (crop), FALSE);
+ gst_base_transform_set_in_place (GST_BASE_TRANSFORM (crop), FALSE);
+
return TRUE;
/* ERROR */
-wrong_input:
+cropping_too_much:
{
- GST_DEBUG_OBJECT (crop, "failed to parse input caps %" GST_PTR_FORMAT,
- incaps);
+ GST_WARNING_OBJECT (crop, "we are cropping too much");
return FALSE;
}
-wrong_output:
+unknown_format:
{
- GST_DEBUG_OBJECT (crop, "failed to parse output caps %" GST_PTR_FORMAT,
- outcaps);
+ GST_WARNING_OBJECT (crop, "Unsupported format");
return FALSE;
}
-cropping_too_much:
- {
- GST_DEBUG_OBJECT (crop, "we are cropping too much");
- return FALSE;
+}
+
+/* called with object lock */
+static inline void
+gst_video_crop_set_crop (GstVideoCrop * vcrop, gint new_value, gint * prop)
+{
+ if (*prop != new_value) {
+ *prop = new_value;
+ vcrop->need_update = TRUE;
}
}
@@ -684,35 +846,35 @@ gst_video_crop_set_property (GObject * object, guint prop_id,
video_crop = GST_VIDEO_CROP (object);
- /* don't modify while we are transforming */
- g_mutex_lock (&video_crop->lock);
-
- /* protect with the object lock so that we can read them */
GST_OBJECT_LOCK (video_crop);
switch (prop_id) {
- case ARG_LEFT:
- video_crop->crop_left = g_value_get_int (value);
+ case PROP_LEFT:
+ gst_video_crop_set_crop (video_crop, g_value_get_int (value),
+ &video_crop->prop_left);
break;
- case ARG_RIGHT:
- video_crop->crop_right = g_value_get_int (value);
+ case PROP_RIGHT:
+ gst_video_crop_set_crop (video_crop, g_value_get_int (value),
+ &video_crop->prop_right);
break;
- case ARG_TOP:
- video_crop->crop_top = g_value_get_int (value);
+ case PROP_TOP:
+ gst_video_crop_set_crop (video_crop, g_value_get_int (value),
+ &video_crop->prop_top);
break;
- case ARG_BOTTOM:
- video_crop->crop_bottom = g_value_get_int (value);
+ case PROP_BOTTOM:
+ gst_video_crop_set_crop (video_crop, g_value_get_int (value),
+ &video_crop->prop_bottom);
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;
}
- GST_LOG_OBJECT (video_crop, "l=%d,r=%d,b=%d,t=%d",
- video_crop->crop_left, video_crop->crop_right, video_crop->crop_bottom,
- video_crop->crop_top);
+ GST_LOG_OBJECT (video_crop, "l=%d,r=%d,b=%d,t=%d, need_update:%d",
+ video_crop->prop_left, video_crop->prop_right, video_crop->prop_bottom,
+ video_crop->prop_top, video_crop->need_update);
+
GST_OBJECT_UNLOCK (video_crop);
- gst_base_transform_reconfigure (GST_BASE_TRANSFORM (video_crop));
- g_mutex_unlock (&video_crop->lock);
+ gst_base_transform_reconfigure_src (GST_BASE_TRANSFORM (video_crop));
}
static void
@@ -725,17 +887,17 @@ gst_video_crop_get_property (GObject * object, guint prop_id, GValue * value,
GST_OBJECT_LOCK (video_crop);
switch (prop_id) {
- case ARG_LEFT:
- g_value_set_int (value, video_crop->crop_left);
+ case PROP_LEFT:
+ g_value_set_int (value, video_crop->prop_left);
break;
- case ARG_RIGHT:
- g_value_set_int (value, video_crop->crop_right);
+ case PROP_RIGHT:
+ g_value_set_int (value, video_crop->prop_right);
break;
- case ARG_TOP:
- g_value_set_int (value, video_crop->crop_top);
+ case PROP_TOP:
+ g_value_set_int (value, video_crop->prop_top);
break;
- case ARG_BOTTOM:
- g_value_set_int (value, video_crop->crop_bottom);
+ case PROP_BOTTOM:
+ g_value_set_int (value, video_crop->prop_bottom);
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
@@ -760,6 +922,6 @@ plugin_init (GstPlugin * plugin)
GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
GST_VERSION_MINOR,
- "videocrop",
+ videocrop,
"Crops video into a user-defined region",
plugin_init, VERSION, GST_LICENSE, GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN)