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, 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,
#define gst_video_crop_parent_class parent_class
G_DEFINE_TYPE (GstVideoCrop, gst_video_crop, GST_TYPE_VIDEO_FILTER);
-static void gst_video_crop_finalize (GObject * object);
-
static void gst_video_crop_set_property (GObject * object, guint prop_id,
const GValue * value, GParamSpec * pspec);
static void gst_video_crop_get_property (GObject * object, guint prop_id,
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)
{
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_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));
- g_object_class_install_property (gobject_class, ARG_RIGHT,
+ 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));
- g_object_class_install_property (gobject_class, ARG_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));
- g_object_class_install_property (gobject_class, ARG_BOTTOM,
+ 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));
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS |
+ GST_PARAM_MUTABLE_PLAYING));
- 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_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 <tim centricular net>");
+ basetransform_class->transform_ip_on_passthrough = FALSE;
basetransform_class->transform_caps =
GST_DEBUG_FUNCPTR (gst_video_crop_transform_caps);
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 =
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);
}
#define ROUND_DOWN_2(n) ((n)&(~1))
static void
gst_video_crop_transform_packed_complex (GstVideoCrop * vcrop,
- GstVideoFrame * in_frame, GstVideoFrame * out_frame)
+ GstVideoFrame * in_frame, GstVideoFrame * out_frame, gint x, gint y)
{
guint8 *in_data, *out_data;
guint i, dx;
static void
gst_video_crop_transform_packed_simple (GstVideoCrop * vcrop,
- GstVideoFrame * in_frame, GstVideoFrame * out_frame)
+ GstVideoFrame * in_frame, GstVideoFrame * out_frame, gint x, gint y)
{
guint8 *in_data, *out_data;
gint width, height;
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_left * GST_VIDEO_FRAME_COMP_PSTRIDE (in_frame, 0);
+ in_data += (vcrop->crop_top + y) * in_stride;
+ in_data +=
+ (vcrop->crop_left + x) * GST_VIDEO_FRAME_COMP_PSTRIDE (in_frame, 0);
dx = width * GST_VIDEO_FRAME_COMP_PSTRIDE (out_frame, 0);
static void
gst_video_crop_transform_planar (GstVideoCrop * vcrop,
- GstVideoFrame * in_frame, GstVideoFrame * out_frame)
+ GstVideoFrame * in_frame, GstVideoFrame * out_frame, gint x, gint y)
{
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;
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);
- y_in +=
- (vcrop->crop_top * GST_VIDEO_FRAME_PLANE_STRIDE (in_frame,
- 0)) + vcrop->crop_left;
+ y_in += (crop_top * GST_VIDEO_FRAME_PLANE_STRIDE (in_frame, 0)) + crop_left;
dx = width;
for (i = 0; i < height; ++i) {
u_in = GST_VIDEO_FRAME_PLANE_DATA (in_frame, 1);
u_out = GST_VIDEO_FRAME_PLANE_DATA (out_frame, 1);
- u_in += (vcrop->crop_top / 2) * GST_VIDEO_FRAME_PLANE_STRIDE (in_frame, 1);
- u_in += vcrop->crop_left / 2;
+ 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 += (vcrop->crop_top / 2) * GST_VIDEO_FRAME_PLANE_STRIDE (in_frame, 2);
- v_in += vcrop->crop_left / 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;
}
}
+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_frame (GstVideoFilter * vfilter,
GstVideoFrame * in_frame, GstVideoFrame * out_frame)
{
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;
+ }
+ }
+
+ if (meta) {
+ x = meta->x;
+ y = meta->y;
+ }
- g_mutex_lock (&vcrop->lock);
switch (vcrop->packing) {
case VIDEO_CROP_PIXEL_FORMAT_PACKED_SIMPLE:
- gst_video_crop_transform_packed_simple (vcrop, in_frame, out_frame);
+ 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, in_frame, out_frame);
+ 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, in_frame, out_frame);
+ 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;
}
return ret;
}
-/* TODO use filter_caps */
static GstCaps *
gst_video_crop_transform_caps (GstBaseTransform * trans,
GstPadDirection direction, GstCaps * caps, GstCaps * filter_caps)
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 = left + right;
dy = top + bottom;
dx = 0 - (left + right);
dy = 0 - (top + bottom);
}
- GST_OBJECT_UNLOCK (vcrop);
GST_LOG_OBJECT (vcrop, "transforming caps %" GST_PTR_FORMAT, caps);
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->prop_left == -1 && crop->prop_right == -1) {
+ if (crop->crop_left == -1 && crop->crop_right == -1) {
crop->crop_left = dx / 2;
crop->crop_right = dx / 2 + (dx & 1);
- } else if (crop->prop_left == -1) {
- if (G_UNLIKELY (crop->prop_right > dx))
+ } else if (crop->crop_left == -1) {
+ if (G_UNLIKELY (crop->crop_right > dx))
goto cropping_too_much;
- crop->crop_left = dx - crop->prop_right;
- } else if (crop->prop_right == -1) {
- if (G_UNLIKELY (crop->prop_left > dx))
+ 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->prop_left;
+ crop->crop_right = dx - crop->crop_left;
}
- if (crop->prop_top == -1 && crop->prop_bottom == -1) {
+ if (crop->crop_top == -1 && crop->crop_bottom == -1) {
crop->crop_top = dy / 2;
crop->crop_bottom = dy / 2 + (dy & 1);
- } else if (crop->prop_top == -1) {
- if (G_UNLIKELY (crop->prop_bottom > dy))
+ } else if (crop->crop_top == -1) {
+ if (G_UNLIKELY (crop->crop_bottom > dy))
goto cropping_too_much;
- crop->crop_top = dy - crop->prop_bottom;
- } else if (crop->prop_bottom == -1) {
- if (G_UNLIKELY (crop->prop_top > dy))
+ 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->prop_top;
+ crop->crop_bottom = dy - crop->crop_top;
}
if (G_UNLIKELY ((crop->crop_left + crop->crop_right) >=
GST_VIDEO_INFO_HEIGHT (in_info)))
goto cropping_too_much;
- 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);
- } else {
- GST_LOG_OBJECT (crop, "we are not using passthrough");
- gst_base_transform_set_passthrough (GST_BASE_TRANSFORM (crop), FALSE);
- }
+ if (in && out)
+ GST_LOG_OBJECT (crop, "incaps = %" GST_PTR_FORMAT ", outcaps = %"
+ GST_PTR_FORMAT, in, out);
if (GST_VIDEO_INFO_IS_RGB (in_info)
|| GST_VIDEO_INFO_IS_GRAY (in_info)) {
crop->macro_y_off = 0;
}
break;
- case GST_VIDEO_FORMAT_GRAY8:
- crop->packing = VIDEO_CROP_PIXEL_FORMAT_PACKED_SIMPLE;
- 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 */
}
}
+/* 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;
+ }
+}
+
static void
gst_video_crop_set_property (GObject * object, guint prop_id,
const GValue * value, GParamSpec * pspec)
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->prop_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->prop_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->prop_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->prop_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_src (GST_BASE_TRANSFORM (video_crop));
- g_mutex_unlock (&video_crop->lock);
}
static void
GST_OBJECT_LOCK (video_crop);
switch (prop_id) {
- case ARG_LEFT:
+ case PROP_LEFT:
g_value_set_int (value, video_crop->prop_left);
break;
- case ARG_RIGHT:
+ case PROP_RIGHT:
g_value_set_int (value, video_crop->prop_right);
break;
- case ARG_TOP:
+ case PROP_TOP:
g_value_set_int (value, video_crop->prop_top);
break;
- case ARG_BOTTOM:
+ case PROP_BOTTOM:
g_value_set_int (value, video_crop->prop_bottom);
break;
default:
projects / platform / upstream / gst-plugins-good.git / blobdiff