mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-04-26 06:54:49 +00:00
Code Issues 1 Projects Releases Wiki Activity

camerabin2 remove redundant viewfinder-colorspace and viewfinder-scale

Browse source 
camrabin2 connects a viewfinderbin on "vfsrc". viewfinderbin is made of:
   vfbin-csp ! vfbin-videoscale ! videosink.

we should either remove csp/videoscale from wrappercamerabinsrc (as
done in this patch) or we should get rid of viewfinderbin altogether.
This commit is contained in:
Raluca Elena Podiuc 2011-07-30 16:12:31 +03:00 committed by Thiago Santos
parent 058a3d9d4c
commit 2e28fe2e18
1 changed files with 2 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
gst/camerabin2/gstwrappercamerabinsrc.c
View file

@ -395,7 +395,6 @@ gst_wrapper_camera_bin_src_construct_pipeline (GstBaseCameraSrc * bcamsrc)
GstElement *src_csp; GstElement *src_csp;
GstElement *capsfilter; GstElement *capsfilter;
gboolean ret = FALSE; gboolean ret = FALSE;
GstElement *videoscale;
GstPad *vf_pad; GstPad *vf_pad;
GstPad *tee_capture_pad; GstPad *tee_capture_pad;
GstPad *src_caps_src_pad; GstPad *src_caps_src_pad;
@ -473,17 +472,9 @@ gst_wrapper_camera_bin_src_construct_pipeline (GstBaseCameraSrc * bcamsrc)
/* viewfinder pad */ /* viewfinder pad */
vf_pad = gst_element_get_request_pad (tee, "src%d"); vf_pad = gst_element_get_request_pad (tee, "src%d");
g_object_set (tee, "alloc-pad", vf_pad, NULL); g_object_set (tee, "alloc-pad", vf_pad, NULL);
gst_ghost_pad_set_target (GST_GHOST_PAD (self->vfsrc), vf_pad);
gst_object_unref (vf_pad); gst_object_unref (vf_pad);
/* the viewfinder should always work, so we add some converters to it */
if (!gst_camerabin_create_and_add_element (cbin, "ffmpegcolorspace",
"viewfinder-colorspace"))
goto done;
if (!(videoscale =
gst_camerabin_create_and_add_element (cbin, "videoscale",
"viewfinder-scale")))
goto done;
/* image/video pad from tee */ /* image/video pad from tee */
tee_capture_pad = gst_element_get_request_pad (tee, "src%d"); tee_capture_pad = gst_element_get_request_pad (tee, "src%d");
@ -526,10 +517,7 @@ gst_wrapper_camera_bin_src_construct_pipeline (GstBaseCameraSrc * bcamsrc)
NULL); NULL);
} }
/* hook-up the vf ghostpad */
vf_pad = gst_element_get_static_pad (videoscale, "src");
gst_ghost_pad_set_target (GST_GHOST_PAD (self->vfsrc), vf_pad);
gst_object_unref (vf_pad);
gst_pad_set_active (self->vfsrc, TRUE); gst_pad_set_active (self->vfsrc, TRUE);
gst_pad_set_active (self->imgsrc, TRUE); /* XXX ??? */ gst_pad_set_active (self->imgsrc, TRUE); /* XXX ??? */