mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-27 04:01:08 +00:00
Code Issues 1 Projects Releases Wiki Activity

camerabin2: Only mark video capture as finished after EOS

Browse source 
Instead of probing the videosink sinkpad for passing EOS, better
to wait for EOS from the bus.

This makes sure the filesink has already processed it and is
ready to close the file. This is used to notify applications
that camerabin2 is idle and can be shut down.
This commit is contained in:
Thiago Santos 2011-03-23 16:32:19 -03:00
parent 6a686316d5
commit d2e1f1bdc6
1 changed files with 9 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
gst/camerabin2/gstcamerabin2.c
View file

@ -724,6 +724,15 @@ gst_camera_bin_handle_message (GstBin * bin, GstMessage * message)
GST_CAMERA_BIN_PROCESSING_DEC (GST_CAMERA_BIN_CAST (bin)); GST_CAMERA_BIN_PROCESSING_DEC (GST_CAMERA_BIN_CAST (bin));
} }
} }
break;
case GST_MESSAGE_EOS:{
GstElement *src = GST_ELEMENT (GST_MESSAGE_SRC (message));
if (src == GST_CAMERA_BIN_CAST (bin)->videosink) {
GST_DEBUG_OBJECT (bin, "EOS from video branch");
GST_CAMERA_BIN_PROCESSING_DEC (GST_CAMERA_BIN_CAST (bin));
}
}
break;
default: default:
break; break;
} }
@ -898,17 +907,6 @@ gst_camera_bin_link_encodebin (GstCameraBin * camera, GstElement * element,
return ret; return ret;
} }
static gboolean
videosink_event_probe (GstPad * pad, GstEvent * evt, gpointer data)
{
GstCameraBin *camera = data;
if (GST_EVENT_TYPE (evt) == GST_EVENT_EOS) {
GST_CAMERA_BIN_PROCESSING_DEC (camera);
}
return TRUE;
}
static void static void
gst_camera_bin_src_notify_max_zoom_cb (GObject * self, GParamSpec * pspec, gst_camera_bin_src_notify_max_zoom_cb (GObject * self, GParamSpec * pspec,
gpointer user_data) gpointer user_data)
@ -951,15 +949,6 @@ gst_camera_bin_create_elements (GstCameraBin * camera)
camera->videosink = camera->videosink =
gst_element_factory_make ("filesink", "videobin-filesink"); gst_element_factory_make ("filesink", "videobin-filesink");
g_object_set (camera->videosink, "async", FALSE, NULL); g_object_set (camera->videosink, "async", FALSE, NULL);
{
GstPad *pad;
pad = gst_element_get_static_pad (camera->videosink, "sink");
camera->videosink_probe = gst_pad_add_event_probe (pad,
(GCallback) videosink_event_probe, camera);
gst_object_unref (pad);
}
/* audio elements */ /* audio elements */
camera->audio_queue = gst_element_factory_make ("queue", "audio-queue"); camera->audio_queue = gst_element_factory_make ("queue", "audio-queue");