mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-03-28 20:05:38 +00:00
Code Issues 1 Projects Releases Wiki Activity

camerabin: allow capture resolution to be set in NULL state

Browse source
This commit is contained in:
Tommi Myöhänen 2009-08-20 17:55:26 +03:00 committed by René Stadler
parent 0f2be803b4
commit dacdd5d6c9
2 changed files with 31 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
gst/camerabin/gstcamerabin.c
View file

@ -349,6 +349,10 @@ static void gst_camerabin_user_stop (GstCameraBin * camera);
static void gst_camerabin_user_pause (GstCameraBin * camera);
static void
gst_camerabin_set_image_capture_caps (GstCameraBin * camera, gint width,
gint height);
static void
gst_camerabin_user_res_fps (GstCameraBin * camera, gint width, gint height,
gint fps_n, gint fps_d);
@ -1544,7 +1548,14 @@ gst_camerabin_start_image_capture (GstCameraBin * camera)
}
if (!camera->image_capture_caps) {
camera->image_capture_caps = gst_caps_copy (camera->view_finder_caps);
if (camera->image_width && camera->image_height) {
/* Resolution is set, but it isn't in use yet */
gst_camerabin_set_image_capture_caps (camera, camera->image_width,
camera->image_height);
} else {
/* Capture resolution not set. Use viewfinder resolution */
camera->image_capture_caps = gst_caps_copy (camera->view_finder_caps);
}
}
/* Start preparations for image capture */
@ -2606,7 +2617,6 @@ gst_camerabin_class_init (GstCameraBinClass * klass)
*
* Changes the resolution used for still image capture.
* Does not affect view finder mode and video recording.
* Use this action signal in PAUSED or PLAYING state.
*/
camerabin_signals[USER_IMAGE_RES_SIGNAL] =
@ -2676,6 +2686,8 @@ gst_camerabin_init (GstCameraBin * camera, GstCameraBinClass * gclass)
camera->height = DEFAULT_HEIGHT;
camera->fps_n = DEFAULT_FPS_N;
camera->fps_d = DEFAULT_FPS_D;
camera->image_width = 0;
camera->image_height = 0;
camera->event_tags = gst_tag_list_new ();
@ -3254,7 +3266,8 @@ gst_camerabin_user_res_fps (GstCameraBin * camera, gint width, gint height,
}
static void
gst_camerabin_user_image_res (GstCameraBin * camera, gint width, gint height)
gst_camerabin_set_image_capture_caps (GstCameraBin * camera, gint width,
gint height)
{
GstStructure *structure;
GstCaps *new_caps = NULL;
@ -3278,6 +3291,17 @@ gst_camerabin_user_image_res (GstCameraBin * camera, gint width, gint height)
gst_caps_replace (&camera->image_capture_caps, new_caps);
}
static void
gst_camerabin_user_image_res (GstCameraBin * camera, gint width, gint height)
{
/* Set the caps now already, if possible */
gst_camerabin_set_image_capture_caps (camera, width, height);
/* These will be used in _start_image_capture() function */
camera->image_width = width;
camera->image_height = height;
}
/* entry point to initialize the plug-in
* initialize the plug-in itself
* register the element factories and pad templates

4
gst/camerabin/gstcamerabin.h
View file

@ -68,6 +68,10 @@ struct _GstCameraBin
gint fps_n;
gint fps_d;
/* Image capture resolution */
gint image_width;
gint image_height;
/* Image tags are collected here first before sending to imgbin */
GstTagList *event_tags;