yair/gst-plugin-linescan
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

phoenix: add property for number of capture buffers

Browse Source
This commit is contained in:
Joshua M. Doe 2011-11-07 12:50:25 -05:00
parent c3f3f9897d
commit 9ebfbe4c7d
2 changed files with 27 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
sys/phoenix/gstphoenixsrc.c
View File

@ -78,17 +78,12 @@ static GstFlowReturn gst_phoenixsrc_create (GstPushSrc * src, GstBuffer ** buf);
enum enum
{ {
PROP_0, PROP_0,
PROP_CAMERA_CONFIG_FILEPATH/*, PROP_CAMERA_CONFIG_FILEPATH,
PROP_BOARD_INDEX, PROP_NUM_CAPTURE_BUFFERS
PROP_CAMERA_TYPE,
PROP_CONNECTOR*/
/* FILL ME */
}; };
#define DEFAULT_PROP_CAMERA_CONFIG_FILEPATH NULL /* defaults to 640x480x8bpp */ #define DEFAULT_PROP_CAMERA_CONFIG_FILEPATH NULL /* defaults to 640x480x8bpp */
/*#define DEFAULT_PROP_BOARD_INDEX 0 #define DEFAULT_PROP_NUM_CAPTURE_BUFFERS 2
#define DEFAULT_PROP_CAMERA_TYPE MC_Camera_CAMERA_NTSC
#define DEFAULT_PROP_CONNECTOR MC_Connector_VID1*/
/* pad templates */ /* pad templates */
@ -253,20 +248,16 @@ gst_phoenixsrc_class_init (GstPhoenixSrcClass * klass)
push_src_class->create = GST_DEBUG_FUNCPTR (gst_phoenixsrc_create); push_src_class->create = GST_DEBUG_FUNCPTR (gst_phoenixsrc_create);
/* Install GObject properties */ /* Install GObject properties */
g_object_class_install_property (gobject_class, PROP_CAMERA_CONFIG_FILEPATH, g_object_class_install_property (gobject_class, PROP_CAMERA_CONFIG_FILEPATH,
g_param_spec_string ("config-file", "Config file", g_param_spec_string ("config-file", "Config file",
"Camera configuration filepath", DEFAULT_PROP_CAMERA_CONFIG_FILEPATH, "Camera configuration filepath", DEFAULT_PROP_CAMERA_CONFIG_FILEPATH,
G_PARAM_READWRITE)); (GParamFlags) (G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)));
//g_object_class_install_property (gobject_class, PROP_CAMERA_TYPE, g_object_class_install_property (gobject_class, PROP_NUM_CAPTURE_BUFFERS,
// g_param_spec_enum ("camera", "Camera", g_param_spec_uint ("num-capture-buffers", "Number of capture buffers",
// "Camera type", GST_TYPE_PHOENIX_SRC_CAMERA, "Number of capture buffers", 1, G_MAXUINT,
// DEFAULT_PROP_CAMERA_TYPE, G_PARAM_READWRITE)); DEFAULT_PROP_NUM_CAPTURE_BUFFERS,
//g_object_class_install_property (gobject_class, PROP_CONNECTOR, (GParamFlags) (G_PARAM_READWRITE |G_PARAM_STATIC_STRINGS)));
// g_param_spec_enum ("connector", "Connector",
// "Connector where camera is attached", GST_TYPE_PHOENIX_SRC_CONNECTOR,
// DEFAULT_PROP_CONNECTOR, G_PARAM_READWRITE));
} }
@ -284,6 +275,7 @@ gst_phoenixsrc_init (GstPhoenixSrc * phoenixsrc, GstPhoenixSrcClass * phoenixsrc
/* initialize member variables */ /* initialize member variables */
phoenixsrc->config_filepath = g_strdup (DEFAULT_PROP_CAMERA_CONFIG_FILEPATH); phoenixsrc->config_filepath = g_strdup (DEFAULT_PROP_CAMERA_CONFIG_FILEPATH);
phoenixsrc->num_capture_buffers = DEFAULT_PROP_NUM_CAPTURE_BUFFERS;
phoenixsrc->buffer_ready = FALSE; phoenixsrc->buffer_ready = FALSE;
phoenixsrc->timeout_occurred = FALSE; phoenixsrc->timeout_occurred = FALSE;
@ -324,6 +316,17 @@ gst_phoenixsrc_set_property (GObject * object, guint property_id,
g_free (phoenixsrc->config_filepath); g_free (phoenixsrc->config_filepath);
phoenixsrc->config_filepath = g_strdup (g_value_get_string (value)); phoenixsrc->config_filepath = g_strdup (g_value_get_string (value));
break; break;
case PROP_NUM_CAPTURE_BUFFERS:
if (phoenixsrc->acq_started) {
GST_ELEMENT_WARNING (phoenixsrc, RESOURCE, SETTINGS,
("Number of capture buffers cannot be changed after acquisition has started."),
(NULL));
}
else {
phoenixsrc->num_capture_buffers = g_value_get_uint (value);
}
break;
default: default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
break; break;
@ -343,6 +346,9 @@ gst_phoenixsrc_get_property (GObject * object, guint property_id,
case PROP_CAMERA_CONFIG_FILEPATH: case PROP_CAMERA_CONFIG_FILEPATH:
g_value_set_string (value, phoenixsrc->config_filepath); g_value_set_string (value, phoenixsrc->config_filepath);
break; break;
case PROP_NUM_CAPTURE_BUFFERS:
g_value_set_uint (value, phoenixsrc->num_capture_buffers);
break;
default: default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
break; break;
@ -561,8 +567,8 @@ gst_phoenixsrc_start (GstBaseSrc * src)
if (PHX_OK != eStat) goto ResourceSettingsError; if (PHX_OK != eStat) goto ResourceSettingsError;
phoenixsrc->buffer_size = dwBufferHeight * dwBufferWidth; phoenixsrc->buffer_size = dwBufferHeight * dwBufferWidth;
/* Tell Phoenix to use N buffers. TODO: make this a property */ /* Tell Phoenix to use N buffers. */
eParamValue = 2; eParamValue = phoenixsrc->num_capture_buffers;
PHX_ParameterSet (phoenixsrc->hCamera, PHX_ACQ_NUM_IMAGES, &eParamValue); PHX_ParameterSet (phoenixsrc->hCamera, PHX_ACQ_NUM_IMAGES, &eParamValue);
/* Setup a one second timeout value (milliseconds) */ /* Setup a one second timeout value (milliseconds) */

1
sys/phoenix/gstphoenixsrc.h
View File

@ -65,6 +65,7 @@ struct _GstPhoenixSrc
/* properties */ /* properties */
gchar *config_filepath; gchar *config_filepath;
guint num_capture_buffers;
guint32 buffer_size; guint32 buffer_size;
gboolean buffer_ready; gboolean buffer_ready;