mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-11-24 02:31:03 +00:00
basecamerasrc: remove unused get_allowed_input_caps
The use of this method was removed in:
commit 539f10f4d9
basecamerasrc: More cleanup
The code from wrappercamerabinsrc is from v4l2camerasrc but is unused:
get_allowed_input_caps is not called anywhere.
This commit is contained in:
parent
28df77b7b0
commit
058a3d9d4c
3 changed files with 0 additions and 91 deletions
|
@ -222,24 +222,6 @@ gst_base_camera_src_setup_preview (GstBaseCameraSrc * self,
|
||||||
bclass->set_preview (self, preview_caps);
|
bclass->set_preview (self, preview_caps);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* gst_base_camera_src_get_allowed_input_caps:
|
|
||||||
* @self: the camerasrc bin
|
|
||||||
*
|
|
||||||
* Retrieve caps from videosrc describing formats it supports
|
|
||||||
*
|
|
||||||
* Returns: caps object from videosrc
|
|
||||||
*/
|
|
||||||
GstCaps *
|
|
||||||
gst_base_camera_src_get_allowed_input_caps (GstBaseCameraSrc * self)
|
|
||||||
{
|
|
||||||
GstBaseCameraSrcClass *bclass = GST_BASE_CAMERA_SRC_GET_CLASS (self);
|
|
||||||
|
|
||||||
g_return_val_if_fail (bclass->get_allowed_input_caps, NULL);
|
|
||||||
|
|
||||||
return bclass->get_allowed_input_caps (self);
|
|
||||||
}
|
|
||||||
|
|
||||||
static void
|
static void
|
||||||
gst_base_camera_src_start_capture (GstBaseCameraSrc * src)
|
gst_base_camera_src_start_capture (GstBaseCameraSrc * src)
|
||||||
{
|
{
|
||||||
|
|
|
@ -118,9 +118,6 @@ struct _GstBaseCameraSrcClass
|
||||||
gboolean (*set_preview) (GstBaseCameraSrc *self,
|
gboolean (*set_preview) (GstBaseCameraSrc *self,
|
||||||
GstCaps *preview_caps);
|
GstCaps *preview_caps);
|
||||||
|
|
||||||
/* unused */
|
|
||||||
GstCaps * (*get_allowed_input_caps) (GstBaseCameraSrc * self);
|
|
||||||
|
|
||||||
/* Called by the handler for 'start-capture'. Mandatory. */
|
/* Called by the handler for 'start-capture'. Mandatory. */
|
||||||
gboolean (*start_capture) (GstBaseCameraSrc * src);
|
gboolean (*start_capture) (GstBaseCameraSrc * src);
|
||||||
|
|
||||||
|
@ -141,7 +138,6 @@ GstColorBalance * gst_base_camera_src_get_color_balance (GstBaseCameraSrc *self)
|
||||||
gboolean gst_base_camera_src_set_mode (GstBaseCameraSrc *self, GstCameraBinMode mode);
|
gboolean gst_base_camera_src_set_mode (GstBaseCameraSrc *self, GstCameraBinMode mode);
|
||||||
void gst_base_camera_src_setup_zoom (GstBaseCameraSrc * self);
|
void gst_base_camera_src_setup_zoom (GstBaseCameraSrc * self);
|
||||||
void gst_base_camera_src_setup_preview (GstBaseCameraSrc * self, GstCaps * preview_caps);
|
void gst_base_camera_src_setup_preview (GstBaseCameraSrc * self, GstCaps * preview_caps);
|
||||||
GstCaps * gst_base_camera_src_get_allowed_input_caps (GstBaseCameraSrc * self);
|
|
||||||
void gst_base_camera_src_finish_capture (GstBaseCameraSrc *self);
|
void gst_base_camera_src_finish_capture (GstBaseCameraSrc *self);
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -854,73 +854,6 @@ gst_wrapper_camera_bin_src_set_zoom (GstBaseCameraSrc * bcamsrc, gfloat zoom)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
static GstCaps *
|
|
||||||
gst_wrapper_camera_bin_src_get_allowed_input_caps (GstBaseCameraSrc * bcamsrc)
|
|
||||||
{
|
|
||||||
GstWrapperCameraBinSrc *self = GST_WRAPPER_CAMERA_BIN_SRC (bcamsrc);
|
|
||||||
GstCaps *caps = NULL;
|
|
||||||
GstPad *pad = NULL, *peer_pad = NULL;
|
|
||||||
GstState state;
|
|
||||||
GstElement *videosrc;
|
|
||||||
|
|
||||||
videosrc = self->src_vid_src ? self->src_vid_src : self->app_vid_src;
|
|
||||||
|
|
||||||
if (!videosrc) {
|
|
||||||
GST_WARNING_OBJECT (self, "no videosrc, can't get allowed caps");
|
|
||||||
goto failed;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (self->allowed_caps) {
|
|
||||||
GST_DEBUG_OBJECT (self, "returning cached caps");
|
|
||||||
goto done;
|
|
||||||
}
|
|
||||||
|
|
||||||
pad = gst_element_get_static_pad (videosrc, "src");
|
|
||||||
|
|
||||||
if (!pad) {
|
|
||||||
GST_WARNING_OBJECT (self, "no srcpad in videosrc");
|
|
||||||
goto failed;
|
|
||||||
}
|
|
||||||
|
|
||||||
state = GST_STATE (videosrc);
|
|
||||||
|
|
||||||
/* Make this function work also in NULL state */
|
|
||||||
if (state == GST_STATE_NULL) {
|
|
||||||
GST_DEBUG_OBJECT (self, "setting videosrc to ready temporarily");
|
|
||||||
peer_pad = gst_pad_get_peer (pad);
|
|
||||||
if (peer_pad) {
|
|
||||||
gst_pad_unlink (pad, peer_pad);
|
|
||||||
}
|
|
||||||
/* Set videosrc to READY to open video device */
|
|
||||||
gst_element_set_locked_state (videosrc, TRUE);
|
|
||||||
gst_element_set_state (videosrc, GST_STATE_READY);
|
|
||||||
}
|
|
||||||
|
|
||||||
self->allowed_caps = gst_pad_get_caps (pad);
|
|
||||||
|
|
||||||
/* Restore state and re-link if necessary */
|
|
||||||
if (state == GST_STATE_NULL) {
|
|
||||||
GST_DEBUG_OBJECT (self, "restoring videosrc state %d", state);
|
|
||||||
/* Reset videosrc to NULL state, some drivers seem to need this */
|
|
||||||
gst_element_set_state (videosrc, GST_STATE_NULL);
|
|
||||||
if (peer_pad) {
|
|
||||||
gst_pad_link (pad, peer_pad);
|
|
||||||
gst_object_unref (peer_pad);
|
|
||||||
}
|
|
||||||
gst_element_set_locked_state (videosrc, FALSE);
|
|
||||||
}
|
|
||||||
|
|
||||||
gst_object_unref (pad);
|
|
||||||
|
|
||||||
done:
|
|
||||||
if (self->allowed_caps) {
|
|
||||||
caps = gst_caps_copy (self->allowed_caps);
|
|
||||||
}
|
|
||||||
GST_DEBUG_OBJECT (self, "allowed caps:%" GST_PTR_FORMAT, caps);
|
|
||||||
failed:
|
|
||||||
return caps;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* update_aspect_filter:
|
* update_aspect_filter:
|
||||||
* @self: camerasrc object
|
* @self: camerasrc object
|
||||||
|
@ -1172,8 +1105,6 @@ gst_wrapper_camera_bin_src_class_init (GstWrapperCameraBinSrcClass * klass)
|
||||||
gst_wrapper_camera_bin_src_construct_pipeline;
|
gst_wrapper_camera_bin_src_construct_pipeline;
|
||||||
gstbasecamerasrc_class->set_zoom = gst_wrapper_camera_bin_src_set_zoom;
|
gstbasecamerasrc_class->set_zoom = gst_wrapper_camera_bin_src_set_zoom;
|
||||||
gstbasecamerasrc_class->set_mode = gst_wrapper_camera_bin_src_set_mode;
|
gstbasecamerasrc_class->set_mode = gst_wrapper_camera_bin_src_set_mode;
|
||||||
gstbasecamerasrc_class->get_allowed_input_caps =
|
|
||||||
gst_wrapper_camera_bin_src_get_allowed_input_caps;
|
|
||||||
gstbasecamerasrc_class->start_capture =
|
gstbasecamerasrc_class->start_capture =
|
||||||
gst_wrapper_camera_bin_src_start_capture;
|
gst_wrapper_camera_bin_src_start_capture;
|
||||||
gstbasecamerasrc_class->stop_capture =
|
gstbasecamerasrc_class->stop_capture =
|
||||||
|
|
Loading…
Reference in a new issue