mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-18 06:16:36 +00:00
Code Issues 1 Projects Releases Wiki Activity

wrappercamerabinsrc: Fix preview messages

Browse source 
Image previews where being posted in sync with the buffers
timestamps, this makes no sense as previews should be posted ASAP.

Also adds some debugging messages.
This commit is contained in:
Thiago Santos 2011-02-01 11:19:53 -03:00
parent 1a62d9374b
commit 48b05a3002
2 changed files with 17 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
gst/camerabin2/camerabingeneral.c
View file

@ -375,6 +375,8 @@ gst_camerabin_create_preview_pipeline (GstElement * element,
gst_app_sink_set_callbacks ((GstAppSink *) data->appsink, &callbacks, data, gst_app_sink_set_callbacks ((GstAppSink *) data->appsink, &callbacks, data,
NULL); NULL);
g_object_set (data->appsink, "sync", FALSE, NULL);
data->element = element; data->element = element;
data->filter = filter; data->filter = filter;

19
gst/camerabin2/gstwrappercamerabinsrc.c
View file

@ -115,9 +115,13 @@ gst_wrapper_camera_bin_src_set_property (GObject * object,
case PROP_PREVIEW_CAPS: case PROP_PREVIEW_CAPS:
gst_caps_replace (&self->preview_caps, gst_caps_replace (&self->preview_caps,
(GstCaps *) gst_value_get_caps (value)); (GstCaps *) gst_value_get_caps (value));
if (self->preview_pipeline) if (self->preview_pipeline) {
GST_DEBUG_OBJECT (self,
"Setting preview pipeline caps %" GST_PTR_FORMAT,
self->preview_caps);
gst_camerabin_preview_set_caps (self->preview_pipeline, gst_camerabin_preview_set_caps (self->preview_pipeline,
(GstCaps *) gst_value_get_caps (value)); (GstCaps *) gst_value_get_caps (value));
}
break; break;
case PROP_PREVIEW_FILTER: case PROP_PREVIEW_FILTER:
if (self->preview_filter) if (self->preview_filter)
@ -236,8 +240,10 @@ gst_wrapper_camera_bin_src_imgsrc_probe (GstPad * pad, GstBuffer * buffer,
/* post preview */ /* post preview */
/* TODO This can likely be optimized if the viewfinder caps is the same as /* TODO This can likely be optimized if the viewfinder caps is the same as
* the preview caps, avoiding another scaling of the same buffer. */ * the preview caps, avoiding another scaling of the same buffer. */
if (self->post_previews) if (self->post_previews) {
GST_DEBUG_OBJECT (self, "Posting preview for image");
gst_camerabin_preview_pipeline_post (self->preview_pipeline, buffer); gst_camerabin_preview_pipeline_post (self->preview_pipeline, buffer);
}
if (self->image_capture_count == 0) { if (self->image_capture_count == 0) {
gst_base_camera_src_finish_capture (camerasrc); gst_base_camera_src_finish_capture (camerasrc);
@ -285,8 +291,10 @@ gst_wrapper_camera_bin_src_vidsrc_probe (GstPad * pad, GstBuffer * buffer,
self->video_rec_status = GST_VIDEO_RECORDING_STATUS_RUNNING; self->video_rec_status = GST_VIDEO_RECORDING_STATUS_RUNNING;
/* post preview */ /* post preview */
if (self->post_previews) if (self->post_previews) {
GST_DEBUG_OBJECT (self, "Posting preview for video");
gst_camerabin_preview_pipeline_post (self->preview_pipeline, buffer); gst_camerabin_preview_pipeline_post (self->preview_pipeline, buffer);
}
ret = TRUE; ret = TRUE;
} else if (self->video_rec_status == GST_VIDEO_RECORDING_STATUS_FINISHING) { } else if (self->video_rec_status == GST_VIDEO_RECORDING_STATUS_FINISHING) {
@ -504,8 +512,11 @@ gst_wrapper_camera_bin_src_construct_pipeline (GstBaseCameraSrc * bcamsrc)
g_assert (self->preview_pipeline != NULL); g_assert (self->preview_pipeline != NULL);
self->preview_filter_changed = FALSE; self->preview_filter_changed = FALSE;
if (self->preview_caps) if (self->preview_caps) {
GST_DEBUG_OBJECT (self, "Setting preview pipeline caps %" GST_PTR_FORMAT,
self->preview_caps);
gst_camerabin_preview_set_caps (self->preview_pipeline, self->preview_caps); gst_camerabin_preview_set_caps (self->preview_pipeline, self->preview_caps);
}
ret = TRUE; ret = TRUE;
self->elements_created = TRUE; self->elements_created = TRUE;