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

camerabin: don't lose pending state when changing resolution

Browse source
This commit is contained in:
Lasse Laukkanen 2009-03-09 18:25:48 +02:00 committed by René Stadler
parent 65ddcd6d5d
commit 0847a84f41
1 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
gst/camerabin/gstcamerabin.c
View file

@ -2839,17 +2839,26 @@ static void
gst_camerabin_user_res_fps (GstCameraBin * camera, gint width, gint height, gst_camerabin_user_res_fps (GstCameraBin * camera, gint width, gint height,
gint fps_n, gint fps_d) gint fps_n, gint fps_d)
{ {
GstState state; GstState state, pending;
GST_INFO_OBJECT (camera, "switching resolution to %dx%d and fps to %d/%d", GST_INFO_OBJECT (camera, "switching resolution to %dx%d and fps to %d/%d",
width, height, fps_n, fps_d); width, height, fps_n, fps_d);
state = GST_STATE (camera); gst_element_get_state (GST_ELEMENT (camera), &state, &pending, 0);
gst_element_set_state (GST_ELEMENT (camera), GST_STATE_READY); if (state == GST_STATE_PAUSED || state == GST_STATE_PLAYING) {
GST_INFO_OBJECT (camera,
"changing to READY to initialize videosrc with new format");
gst_element_set_state (GST_ELEMENT (camera), GST_STATE_READY);
}
camera->width = width; camera->width = width;
camera->height = height; camera->height = height;
camera->fps_n = fps_n; camera->fps_n = fps_n;
camera->fps_d = fps_d; camera->fps_d = fps_d;
if (pending != GST_STATE_VOID_PENDING) {
GST_LOG_OBJECT (camera, "restoring pending state: %s",
gst_element_state_get_name (pending));
state = pending;
}
gst_element_set_state (GST_ELEMENT (camera), state); gst_element_set_state (GST_ELEMENT (camera), state);
} }