mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-10-06 02:32:23 +00:00
Code Issues 1 Projects Releases Wiki Activity

camerabin: unblock correct pad in reset, support fakesink as view finder

Browse source
This commit is contained in:
Lasse Laukkanen 2009-02-25 10:45:19 +02:00 committed by Stefan Kost
parent 9d4c7e68ab
commit c81bce2b21
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
gst/camerabin/gstcamerabin.c
View file

@ -1670,9 +1670,9 @@ gst_camerabin_reset_to_view_finder (GstCameraBin * camera)
gst_pad_set_blocked_async (camera->srcpad_zoom_filter, FALSE,
(GstPadBlockCallback) image_pad_blocked, camera);
}
/* Unblock, if dataflow to image bin is blocked due to waiting for eos */
if (camera->pad_src_img && gst_pad_is_blocked (camera->pad_src_img)) {
gst_pad_set_blocked_async (camera->pad_src_img, FALSE,
/* Unblock, if dataflow in videosrc is blocked due to waiting for eos */
if (camera->srcpad_videosrc && gst_pad_is_blocked (camera->srcpad_videosrc)) {
gst_pad_set_blocked_async (camera->srcpad_videosrc, FALSE,
(GstPadBlockCallback) image_pad_blocked, camera);
}
@ -1916,7 +1916,7 @@ gst_camerabin_update_aspect_filter (GstCameraBin * camera, GstCaps * new_caps)
if (sink_pad) {
sink_caps = gst_pad_get_caps (sink_pad);
gst_object_unref (sink_pad);
if (sink_caps) {
if (sink_caps && !gst_caps_is_any (sink_caps)) {
GST_DEBUG_OBJECT (camera, "sink element caps %" GST_PTR_FORMAT,
sink_caps);
/* Get maximum resolution that view finder sink accepts */