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

camerabin: Store app preferred capture parameters separately

Browse source 
Store width/height/fps for video captures in a separate variable
than the one that stores the currently used value.

This prevents the user preferences to be lost when resetting
the currently used dimensions for night mode, for example
This commit is contained in:
Thiago Santos 2010-09-20 11:54:20 -03:00
parent 73a909c0e3
commit 6ee256d462
2 changed files with 66 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

78
gst/camerabin/gstcamerabin.c
View file

@ -354,6 +354,9 @@ gst_camerabin_set_image_capture_caps (GstCameraBin * camera, gint width,
static void static void
gst_camerabin_set_video_resolution_fps (GstCameraBin * camera, gint width, gst_camerabin_set_video_resolution_fps (GstCameraBin * camera, gint width,
gint height, gint fps_n, gint fps_d); gint height, gint fps_n, gint fps_d);
static void
do_set_video_resolution_fps (GstCameraBin * camera, gint width,
gint height, gint fps_n, gint fps_d);
static void static void
gst_camerabin_set_image_resolution (GstCameraBin * camera, gint width, gst_camerabin_set_image_resolution (GstCameraBin * camera, gint width,
@ -481,21 +484,22 @@ camerabin_setup_src_elements (GstCameraBin * camera)
gst_camerabin_monitor_video_source_properties (camera); gst_camerabin_monitor_video_source_properties (camera);
if (camera->width > 0 && camera->height > 0) { if (camera->app_width > 0 && camera->app_height > 0) {
gst_structure_set (st, gst_structure_set (st,
"width", G_TYPE_INT, camera->width, "width", G_TYPE_INT, camera->app_width,
"height", G_TYPE_INT, camera->height, NULL); "height", G_TYPE_INT, camera->app_height, NULL);
} }
if (camera->fps_n > 0 && camera->fps_d > 0) { if (camera->app_fps_n > 0 && camera->app_fps_d > 0) {
if (camera->night_mode) { if (camera->night_mode) {
GST_INFO_OBJECT (camera, "night mode, lowest allowed fps will be forced"); GST_INFO_OBJECT (camera, "night mode, lowest allowed fps will be forced");
camera->pre_night_fps_n = camera->fps_n; camera->pre_night_fps_n = camera->app_fps_n;
camera->pre_night_fps_d = camera->fps_d; camera->pre_night_fps_d = camera->app_fps_d;
detect_framerate = TRUE; detect_framerate = TRUE;
} else { } else {
gst_structure_set (st, gst_structure_set (st,
"framerate", GST_TYPE_FRACTION, camera->fps_n, camera->fps_d, NULL); "framerate", GST_TYPE_FRACTION, camera->app_fps_n,
camera->app_fps_d, NULL);
new_caps = gst_caps_new_full (st, NULL); new_caps = gst_caps_new_full (st, NULL);
} }
} else { } else {
@ -2486,8 +2490,7 @@ gst_camerabin_handle_scene_mode (GstCameraBin * camera, GstSceneMode scene_mode)
/* Remember frame rate before setting night mode */ /* Remember frame rate before setting night mode */
camera->pre_night_fps_n = camera->fps_n; camera->pre_night_fps_n = camera->fps_n;
camera->pre_night_fps_d = camera->fps_d; camera->pre_night_fps_d = camera->fps_d;
g_signal_emit_by_name (camera, "set-video-resolution-fps", camera->width, do_set_video_resolution_fps (camera, camera->width, camera->height, 0, 1);
camera->height, 0, 1, NULL);
} else { } else {
GST_DEBUG ("night mode already enabled"); GST_DEBUG ("night mode already enabled");
} }
@ -2496,8 +2499,8 @@ gst_camerabin_handle_scene_mode (GstCameraBin * camera, GstSceneMode scene_mode)
GST_DEBUG ("disabling night mode, restoring fps to %d/%d", GST_DEBUG ("disabling night mode, restoring fps to %d/%d",
camera->pre_night_fps_n, camera->pre_night_fps_d); camera->pre_night_fps_n, camera->pre_night_fps_d);
camera->night_mode = FALSE; camera->night_mode = FALSE;
g_signal_emit_by_name (camera, "set-video-resolution-fps", camera->width, do_set_video_resolution_fps (camera, camera->width, camera->height,
camera->height, camera->pre_night_fps_n, camera->pre_night_fps_d, 0); camera->pre_night_fps_n, camera->pre_night_fps_d);
} }
} }
} }
@ -3196,10 +3199,10 @@ gst_camerabin_init (GstCameraBin * camera, GstCameraBinClass * gclass)
camera->night_mode = FALSE; camera->night_mode = FALSE;
camera->eos_handled = FALSE; camera->eos_handled = FALSE;
camera->width = DEFAULT_WIDTH; camera->app_width = camera->width = DEFAULT_WIDTH;
camera->height = DEFAULT_HEIGHT; camera->app_height = camera->height = DEFAULT_HEIGHT;
camera->fps_n = DEFAULT_FPS_N; camera->app_fps_n = camera->fps_n = DEFAULT_FPS_N;
camera->fps_d = DEFAULT_FPS_D; camera->app_fps_d = camera->fps_d = DEFAULT_FPS_D;
camera->image_capture_width = 0; camera->image_capture_width = 0;
camera->image_capture_height = 0; camera->image_capture_height = 0;
camera->base_crop_left = 0; camera->base_crop_left = 0;
@ -3539,6 +3542,8 @@ gst_camerabin_set_property (GObject * object, guint prop_id,
{ {
gint width = g_value_get_int (value); gint width = g_value_get_int (value);
camera->app_width = width;
if (width != camera->width) { if (width != camera->width) {
camera->width = width; camera->width = width;
camera->video_capture_caps_update = TRUE; camera->video_capture_caps_update = TRUE;
@ -3549,6 +3554,8 @@ gst_camerabin_set_property (GObject * object, guint prop_id,
{ {
gint height = g_value_get_int (value); gint height = g_value_get_int (value);
camera->app_height = height;
if (height != camera->height) { if (height != camera->height) {
camera->height = height; camera->height = height;
camera->video_capture_caps_update = TRUE; camera->video_capture_caps_update = TRUE;
@ -3562,6 +3569,9 @@ gst_camerabin_set_property (GObject * object, guint prop_id,
fps_n = gst_value_get_fraction_numerator (value); fps_n = gst_value_get_fraction_numerator (value);
fps_d = gst_value_get_fraction_denominator (value); fps_d = gst_value_get_fraction_denominator (value);
camera->app_fps_n = fps_n;
camera->app_fps_d = fps_d;
if (fps_n != camera->fps_n || fps_d != camera->fps_d) { if (fps_n != camera->fps_n || fps_d != camera->fps_d) {
camera->fps_n = fps_n; camera->fps_n = fps_n;
camera->fps_d = fps_d; camera->fps_d = fps_d;
@ -3677,13 +3687,13 @@ gst_camerabin_get_property (GObject * object, guint prop_id,
g_value_set_int (value, camera->image_capture_height); g_value_set_int (value, camera->image_capture_height);
break; break;
case ARG_VIDEO_CAPTURE_WIDTH: case ARG_VIDEO_CAPTURE_WIDTH:
g_value_set_int (value, camera->width); g_value_set_int (value, camera->app_width);
break; break;
case ARG_VIDEO_CAPTURE_HEIGHT: case ARG_VIDEO_CAPTURE_HEIGHT:
g_value_set_int (value, camera->height); g_value_set_int (value, camera->app_height);
break; break;
case ARG_VIDEO_CAPTURE_FRAMERATE: case ARG_VIDEO_CAPTURE_FRAMERATE:
gst_value_set_fraction (value, camera->fps_n, camera->fps_d); gst_value_set_fraction (value, camera->app_fps_n, camera->app_fps_d);
break; break;
default: default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
@ -3972,6 +3982,38 @@ gst_camerabin_capture_pause (GstCameraBin * camera)
} }
} }
/*
* Updates the properties (excluding the user preferred width/height/fps) and
* tells camerabin to update the video capture caps.
*/
static void
do_set_video_resolution_fps (GstCameraBin * camera, gint width,
gint height, gint fps_n, gint fps_d)
{
if (height != camera->height) {
camera->height = height;
camera->video_capture_caps_update = TRUE;
}
if (width != camera->width) {
camera->width = width;
camera->video_capture_caps_update = TRUE;
}
if (fps_n != camera->fps_n) {
camera->fps_n = fps_n;
camera->video_capture_caps_update = TRUE;
}
if (fps_d != camera->fps_d) {
camera->fps_d = fps_d;
camera->video_capture_caps_update = TRUE;
}
reset_video_capture_caps (camera);
}
/*
* Updates the properties (including the user preferred width/height/fps) and
* tells camerabin to update the video capture caps.
*/
static void static void
gst_camerabin_set_video_resolution_fps (GstCameraBin * camera, gint width, gst_camerabin_set_video_resolution_fps (GstCameraBin * camera, gint width,
gint height, gint fps_n, gint fps_d) gint height, gint fps_n, gint fps_d)

6
gst/camerabin/gstcamerabin.h
View file

@ -91,6 +91,12 @@ struct _GstCameraBin
gint fps_n; gint fps_n;
gint fps_d; gint fps_d;
/* app configured resolution/framerate */
gint app_width;
gint app_height;
gint app_fps_n;
gint app_fps_d;
gboolean video_capture_caps_update; gboolean video_capture_caps_update;
/* Image capture resolution */ /* Image capture resolution */