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

sys/v4l2/gstv4l2object.*: Revert some unintended changes.

Browse source 
Original commit message from CVS:
2007-05-30  Andy Wingo  <wingo@pobox.com>

* sys/v4l2/gstv4l2object.h:
* sys/v4l2/gstv4l2object.c (gst_v4l2_object_new): Revert some
unintended changes.
This commit is contained in:
Andy Wingo 2007-05-30 14:57:44 +00:00
parent 3b5f988239
commit 70615818aa
3 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,5 +1,9 @@
2007-05-30 Andy Wingo <wingo@pobox.com> 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.h:
* sys/v4l2/v4l2src_calls.c (gst_v4l2src_fill_format_list): Store * sys/v4l2/v4l2src_calls.c (gst_v4l2src_fill_format_list): Store
the format list in the order that the driver gives it to us. the format list in the order that the driver gives it to us.

4
sys/v4l2/gstv4l2object.c
View file

@ -249,7 +249,8 @@ gst_v4l2_object_install_properties_helper (GObjectClass * gobject_class)
GstV4l2Object * GstV4l2Object *
gst_v4l2_object_new (GstElement * element, gst_v4l2_object_new (GstElement * element,
GstV4l2GetInOutFunction get_in_out_func, GstV4l2GetInOutFunction get_in_out_func,
GstV4l2SetInOutFunction set_in_out_func) GstV4l2SetInOutFunction set_in_out_func,
GstV4l2UpdateFpsFunction update_fps_func)
{ {
GstV4l2Object *v4l2object; GstV4l2Object *v4l2object;
@ -261,6 +262,7 @@ gst_v4l2_object_new (GstElement * element,
v4l2object->element = element; v4l2object->element = element;
v4l2object->get_in_out_func = get_in_out_func; v4l2object->get_in_out_func = get_in_out_func;
v4l2object->set_in_out_func = set_in_out_func; v4l2object->set_in_out_func = set_in_out_func;
v4l2object->update_fps_func = update_fps_func;
v4l2object->video_fd = -1; v4l2object->video_fd = -1;
v4l2object->buffer = NULL; v4l2object->buffer = NULL;

5
sys/v4l2/gstv4l2object.h
View file

@ -57,6 +57,7 @@ typedef struct _GstV4l2Xv GstV4l2Xv;
typedef gboolean (*GstV4l2GetInOutFunction) (GstV4l2Object * v4l2object, gint * input); typedef gboolean (*GstV4l2GetInOutFunction) (GstV4l2Object * v4l2object, gint * input);
typedef gboolean (*GstV4l2SetInOutFunction) (GstV4l2Object * v4l2object, gint input); typedef gboolean (*GstV4l2SetInOutFunction) (GstV4l2Object * v4l2object, gint input);
typedef gboolean (*GstV4l2UpdateFpsFunction) (GstV4l2Object * v4l2object);
struct _GstV4l2Object { struct _GstV4l2Object {
GstElement * element; GstElement * element;
@ -96,6 +97,7 @@ struct _GstV4l2Object {
/* funcs */ /* funcs */
GstV4l2GetInOutFunction get_in_out_func; GstV4l2GetInOutFunction get_in_out_func;
GstV4l2SetInOutFunction set_in_out_func; GstV4l2SetInOutFunction set_in_out_func;
GstV4l2UpdateFpsFunction update_fps_func;
}; };
struct _GstV4l2ObjectClassHelper { struct _GstV4l2ObjectClassHelper {
@ -113,7 +115,8 @@ GType gst_v4l2_object_get_type (void);
/* create/destroy */ /* create/destroy */
GstV4l2Object * gst_v4l2_object_new (GstElement * element, GstV4l2Object * gst_v4l2_object_new (GstElement * element,
GstV4l2GetInOutFunction get_in_out_func, 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); void gst_v4l2_object_destroy (GstV4l2Object * v4l2object);
/* properties */ /* properties */