mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-24 02:31:03 +00:00
Code Issues 1 Projects Releases Wiki Activity

v4l2camerasrc: Add ready-for-capture property

Browse source 
Adds property that informs if v4l2camerasrc is available
for starting a new capture.

It is useful for applications to know (via deep-notify) when the
property changes and a new capture is possible. Note, however, that
starting a new capture from the notify callback will cause a deadlock.
This commit is contained in:
Thiago Santos 2010-11-30 11:06:33 -03:00
parent bd89d22da9
commit 5be441adff
2 changed files with 27 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
gst/camerabin2/gstcamerabin-enum.h
View file

@ -31,6 +31,7 @@ enum
ARG_0, ARG_0,
ARG_FILENAME, ARG_FILENAME,
ARG_MODE, ARG_MODE,
ARG_READY_FOR_CAPTURE,
ARG_FLAGS, ARG_FLAGS,
ARG_MUTE, ARG_MUTE,
ARG_ZOOM, ARG_ZOOM,

27
gst/camerabin2/gstv4l2camerasrc.c
View file

@ -133,6 +133,9 @@ gst_v4l2_camera_src_get_property (GObject * object,
case ARG_MODE: case ARG_MODE:
g_value_set_enum (value, self->mode); g_value_set_enum (value, self->mode);
break; break;
case ARG_READY_FOR_CAPTURE:
g_value_set_boolean (value, !self->capturing);
break;
case ARG_FILTER_CAPS: case ARG_FILTER_CAPS:
gst_value_set_caps (value, self->view_finder_caps); gst_value_set_caps (value, self->view_finder_caps);
break; break;
@ -168,8 +171,10 @@ gst_v4l2_camera_src_imgsrc_probe (GstPad * pad, GstBuffer * buffer,
if (self->image_capture_count > 0) { if (self->image_capture_count > 0) {
ret = TRUE; ret = TRUE;
self->image_capture_count--; self->image_capture_count--;
if (self->image_capture_count == 0) if (self->image_capture_count == 0) {
self->capturing = FALSE; self->capturing = FALSE;
g_object_notify (G_OBJECT (self), "ready-for-capture");
}
} }
g_mutex_unlock (self->capturing_mutex); g_mutex_unlock (self->capturing_mutex);
return ret; return ret;
@ -206,6 +211,7 @@ gst_v4l2_camera_src_vidsrc_probe (GstPad * pad, GstBuffer * buffer,
gst_pad_push_event (pad, gst_event_new_eos ()); gst_pad_push_event (pad, gst_event_new_eos ());
self->video_rec_status = GST_VIDEO_RECORDING_STATUS_DONE; self->video_rec_status = GST_VIDEO_RECORDING_STATUS_DONE;
self->capturing = FALSE; self->capturing = FALSE;
g_object_notify (G_OBJECT (self), "ready-for-capture");
} else { } else {
ret = TRUE; ret = TRUE;
} }
@ -1059,6 +1065,8 @@ gst_v4l2_camera_src_start_capture (GstV4l2CameraSrc * src)
g_assert_not_reached (); g_assert_not_reached ();
src->capturing = FALSE; src->capturing = FALSE;
} }
if (src->capturing)
g_object_notify (G_OBJECT (src), "ready-for-capture");
g_mutex_unlock (src->capturing_mutex); g_mutex_unlock (src->capturing_mutex);
} }
@ -1083,6 +1091,7 @@ gst_v4l2_camera_src_stop_capture (GstV4l2CameraSrc * src)
} else { } else {
src->image_capture_count = 0; src->image_capture_count = 0;
src->capturing = FALSE; src->capturing = FALSE;
g_object_notify (G_OBJECT (src), "ready-for-capture");
} }
g_mutex_unlock (src->capturing_mutex); g_mutex_unlock (src->capturing_mutex);
} }
@ -1121,6 +1130,22 @@ gst_v4l2_camera_src_class_init (GstV4l2CameraSrcClass * klass)
GST_TYPE_CAMERABIN_MODE, MODE_IMAGE, GST_TYPE_CAMERABIN_MODE, MODE_IMAGE,
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
* GstV4l2CameraSrc:ready-for-capture:
*
* When TRUE new capture can be prepared. If FALSE capturing is ongoing
* and starting a new capture immediately is not possible.
*
* Note that calling start-capture from the notify callback of this property
* will cause a deadlock. If you need to react like this on the notify
* function, please schedule a new thread to do it. If you're using glib's
* mainloop you can use g_idle_add() for example.
*/
g_object_class_install_property (gobject_class, ARG_READY_FOR_CAPTURE,
g_param_spec_boolean ("ready-for-capture", "Ready for capture",
"Informs this element is ready for starting another capture",
TRUE, G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
/* Signals */ /* Signals */
v4l2camerasrc_signals[START_CAPTURE_SIGNAL] = v4l2camerasrc_signals[START_CAPTURE_SIGNAL] =
g_signal_new ("start-capture", g_signal_new ("start-capture",