diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | sys/v4l2/gstv4l2object.c | 4 | ||||
| -rw-r--r-- | sys/v4l2/gstv4l2object.h | 5 |
3 files changed, 11 insertions, 2 deletions
@@ -1,5 +1,9 @@ 2007-05-30 Andy Wingo <wingo@pobox.com> + * sys/v4l2/gstv4l2object.h: + * sys/v4l2/gstv4l2object.c (gst_v4l2_object_new): Revert some + unintended changes. + * sys/v4l2/v4l2src_calls.h: * sys/v4l2/v4l2src_calls.c (gst_v4l2src_fill_format_list): Store the format list in the order that the driver gives it to us. diff --git a/sys/v4l2/gstv4l2object.c b/sys/v4l2/gstv4l2object.c index 0913be74..c842e8b9 100644 --- a/sys/v4l2/gstv4l2object.c +++ b/sys/v4l2/gstv4l2object.c @@ -249,7 +249,8 @@ gst_v4l2_object_install_properties_helper (GObjectClass * gobject_class) GstV4l2Object * gst_v4l2_object_new (GstElement * element, GstV4l2GetInOutFunction get_in_out_func, - GstV4l2SetInOutFunction set_in_out_func) + GstV4l2SetInOutFunction set_in_out_func, + GstV4l2UpdateFpsFunction update_fps_func) { GstV4l2Object *v4l2object; @@ -261,6 +262,7 @@ gst_v4l2_object_new (GstElement * element, v4l2object->element = element; v4l2object->get_in_out_func = get_in_out_func; v4l2object->set_in_out_func = set_in_out_func; + v4l2object->update_fps_func = update_fps_func; v4l2object->video_fd = -1; v4l2object->buffer = NULL; diff --git a/sys/v4l2/gstv4l2object.h b/sys/v4l2/gstv4l2object.h index 94f3bf25..f309bc7d 100644 --- a/sys/v4l2/gstv4l2object.h +++ b/sys/v4l2/gstv4l2object.h @@ -57,6 +57,7 @@ typedef struct _GstV4l2Xv GstV4l2Xv; typedef gboolean (*GstV4l2GetInOutFunction) (GstV4l2Object * v4l2object, gint * input); typedef gboolean (*GstV4l2SetInOutFunction) (GstV4l2Object * v4l2object, gint input); +typedef gboolean (*GstV4l2UpdateFpsFunction) (GstV4l2Object * v4l2object); struct _GstV4l2Object { GstElement * element; @@ -96,6 +97,7 @@ struct _GstV4l2Object { /* funcs */ GstV4l2GetInOutFunction get_in_out_func; GstV4l2SetInOutFunction set_in_out_func; + GstV4l2UpdateFpsFunction update_fps_func; }; struct _GstV4l2ObjectClassHelper { @@ -113,7 +115,8 @@ GType gst_v4l2_object_get_type (void); /* create/destroy */ GstV4l2Object * gst_v4l2_object_new (GstElement * element, GstV4l2GetInOutFunction get_in_out_func, - GstV4l2SetInOutFunction set_in_out_func); + GstV4l2SetInOutFunction set_in_out_func, + GstV4l2UpdateFpsFunction update_fps_func); void gst_v4l2_object_destroy (GstV4l2Object * v4l2object); /* properties */ |