mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-12-28 19:20:35 +00:00
examples: camerabin: add --no-xwindow option and fix option handling
Add --no-xwindow option to not to create xwindow. Also fix zoom and mute option types and filename string handling.
This commit is contained in:
Teemu Katajisto
Thiago Santos
parent
0817440ee1
commit
638f681f83
1 changed files with 36 additions and 29 deletions
|
|
@ -19,20 +19,17 @@
|
|||
*/
|
||||
|
||||
/*
|
||||
Compile using:
|
||||
gcc -Wall `pkg-config --cflags --libs gstreamer-0.10` gst-camerabin-test.c -o gst-camerabin-test
|
||||
|
||||
Examples:
|
||||
./gst-camerabin-test --image-width=2048 --image-height=1536 --image-enc=dspjpegenc
|
||||
./gst-camerabin-test --mode=1 --capture-time=10 --image-width=848 --image-height=480 --view-framerate-num=2825 \
|
||||
--view-framerate-den=100 --audio-src=pulsesrc --audio-enc=nokiaaacenc --video-enc=dspmp4venc \
|
||||
--video-mux=mp4mux --src-colorspace=UYVY
|
||||
|
||||
./gst-camerabin-test --help
|
||||
gst-camerabin-test --help
|
||||
Usage:
|
||||
gst-camerabin-test [OPTION...]
|
||||
|
||||
camerabin command line test application
|
||||
camerabin command line test application.
|
||||
|
||||
Help Options:
|
||||
-h, --help Show help options
|
||||
|
|
@ -51,9 +48,9 @@
|
|||
--directory Directory for capture file(s) (default is current directory)
|
||||
--mode Capture mode (default = 0 (image), 1 = video)
|
||||
--capture-time Time to capture video in seconds (default = 10)
|
||||
--capture-total Total number of captures to be done
|
||||
--capture-total Total number of captures to be done (default = 1)
|
||||
--flags Flags for camerabin, (default = 0x9)
|
||||
--mute Mute audio (default = 0 (no))
|
||||
--mute Mute audio
|
||||
--zoom Zoom (100 = 1x (default), 200 = 2x etc.)
|
||||
--audio-src Audio source used in video recording
|
||||
--audio-bitrate Audio bitrate (default 128000)
|
||||
|
|
@ -70,10 +67,14 @@
|
|||
--image-height Height for image capture
|
||||
--view-framerate-num Framerate numerator for viewfinder
|
||||
--view-framerate-den Framerate denominator for viewfinder
|
||||
--src-colorspace Colorspace format for videosource (e.g. YUY2, UYVY)
|
||||
--src-colorspace Colorspace format for video source (e.g. YUY2, UYVY)
|
||||
--src-format Video format for video source
|
||||
--preview-caps Preview caps (e.g. video/x-raw-rgb,width=320,height=240)
|
||||
--video-source-filter Video filter to process all frames from video source
|
||||
--video-source-filter Video filter to process all frames from video source
|
||||
--viewfinder-filter Filter to process all frames going to viewfinder sink
|
||||
--x-width X window width (default = 320)
|
||||
--x-height X window height (default = 240)
|
||||
--no-xwindow Do not create XWindow
|
||||
|
||||
*/
|
||||
|
||||
|
|
@ -131,6 +132,7 @@ static gint image_width = 1280;
|
|||
static gint image_height = 720;
|
||||
static gint view_framerate_num = 2825;
|
||||
static gint view_framerate_den = 100;
|
||||
static gboolean no_xwindow = FALSE;
|
||||
|
||||
/* photography interface command line options */
|
||||
static gfloat ev_compensation = 0.0;
|
||||
|
|
@ -143,7 +145,7 @@ static gint wb_mode = 0;
|
|||
static gint color_mode = 0;
|
||||
static gint mode = 1;
|
||||
static gint flags = 0x4f;
|
||||
static gint mute = 0;
|
||||
static gboolean mute = FALSE;
|
||||
static gint zoom = 100;
|
||||
|
||||
static gint capture_time = 10;
|
||||
|
|
@ -265,7 +267,7 @@ bus_callback (GstBus * bus, GstMessage * message, gpointer data)
|
|||
st = gst_message_get_structure (message);
|
||||
if (st) {
|
||||
if (gst_structure_has_name (message->structure, "prepare-xwindow-id")) {
|
||||
if (window) {
|
||||
if (!no_xwindow && window) {
|
||||
gst_x_overlay_set_xwindow_id (GST_X_OVERLAY (GST_MESSAGE_SRC
|
||||
(message)), window);
|
||||
gst_message_unref (message);
|
||||
|
|
@ -478,6 +480,7 @@ setup_pipeline (void)
|
|||
g_warning ("can't set camerabin to playing\n");
|
||||
goto error;
|
||||
}
|
||||
|
||||
GST_INFO_OBJECT (camera_bin, "camera started");
|
||||
return TRUE;
|
||||
error:
|
||||
|
|
@ -528,6 +531,8 @@ static gboolean
|
|||
run_pipeline (gpointer user_data)
|
||||
{
|
||||
GstCaps *preview_caps = NULL;
|
||||
gchar *filename_str = NULL;
|
||||
GString *filename_buffer = NULL;
|
||||
|
||||
g_object_set (camera_bin, "mode", mode, NULL);
|
||||
|
||||
|
|
@ -542,14 +547,19 @@ run_pipeline (gpointer user_data)
|
|||
|
||||
set_metadata (camera_bin);
|
||||
|
||||
if (capture_total) {
|
||||
gchar *filename_str = filename->str;
|
||||
filename_str = g_strdup_printf ("%s%d", filename->str, capture_count);
|
||||
g_object_set (camera_bin, "filename", filename_str, NULL);
|
||||
g_free (filename_str);
|
||||
} else {
|
||||
g_object_set (camera_bin, "filename", filename->str, NULL);
|
||||
}
|
||||
filename_str = g_strdup_printf ("/test_%04u", capture_count);
|
||||
filename_buffer = g_string_new (filename->str);
|
||||
filename_buffer = g_string_append (filename_buffer, filename_str);
|
||||
|
||||
if (mode == 1)
|
||||
filename_buffer = g_string_append (filename_buffer, ".mp4");
|
||||
else
|
||||
filename_buffer = g_string_append (filename_buffer, ".jpg");
|
||||
|
||||
g_object_set (camera_bin, "filename", filename_buffer->str, NULL);
|
||||
g_string_free (filename_buffer, FALSE);
|
||||
g_free (filename_str);
|
||||
|
||||
|
||||
g_object_set (camera_bin, "ev-compensation", ev_compensation, NULL);
|
||||
g_object_set (camera_bin, "aperture", aperture, NULL);
|
||||
|
|
@ -615,9 +625,9 @@ main (int argc, char *argv[])
|
|||
"Total number of captures to be done (default = 1)", NULL},
|
||||
{"flags", '\0', G_OPTION_FLAG_OPTIONAL_ARG, G_OPTION_ARG_INT, &flags,
|
||||
"Flags for camerabin, (default = 0x9)", NULL},
|
||||
{"mute", '\0', G_OPTION_FLAG_OPTIONAL_ARG, G_OPTION_ARG_STRING, &mute,
|
||||
"Mute audio (default = 0 (no))", NULL},
|
||||
{"zoom", '\0', G_OPTION_FLAG_OPTIONAL_ARG, G_OPTION_ARG_STRING, &zoom,
|
||||
{"mute", '\0', G_OPTION_FLAG_OPTIONAL_ARG, G_OPTION_ARG_NONE, &mute,
|
||||
"Mute audio", NULL},
|
||||
{"zoom", '\0', G_OPTION_FLAG_OPTIONAL_ARG, G_OPTION_ARG_INT, &zoom,
|
||||
"Zoom (100 = 1x (default), 200 = 2x etc.)", NULL},
|
||||
{"audio-src", '\0', 0, G_OPTION_ARG_STRING, &audiosrc_name,
|
||||
"Audio source used in video recording", NULL},
|
||||
|
|
@ -663,6 +673,8 @@ main (int argc, char *argv[])
|
|||
"X window width (default = 320)", NULL},
|
||||
{"x-height", '\0', 0, G_OPTION_ARG_INT, &x_height,
|
||||
"X window height (default = 240)", NULL},
|
||||
{"no-xwindow", '\0', 0, G_OPTION_ARG_NONE, &no_xwindow,
|
||||
"Do not create XWindow", NULL},
|
||||
{NULL}
|
||||
};
|
||||
|
||||
|
|
@ -670,7 +682,8 @@ main (int argc, char *argv[])
|
|||
GError *err = NULL;
|
||||
|
||||
/* if we fail to create xwindow should we care? */
|
||||
create_host_window ();
|
||||
if (!no_xwindow)
|
||||
create_host_window ();
|
||||
|
||||
if (!g_thread_supported ())
|
||||
g_thread_init (NULL);
|
||||
|
|
@ -698,12 +711,6 @@ main (int argc, char *argv[])
|
|||
if (filename->len == 0)
|
||||
filename = g_string_append (filename, ".");
|
||||
|
||||
filename = g_string_append (filename, "/test_%04u");
|
||||
if (mode == 1)
|
||||
filename = g_string_append (filename, ".mp4");
|
||||
else
|
||||
filename = g_string_append (filename, ".jpg");
|
||||
|
||||
/* init */
|
||||
if (setup_pipeline ()) {
|
||||
loop = g_main_loop_new (NULL, FALSE);
|
||||
|
|
|
|||
Loading…
Reference in a new issue