mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2025-01-19 22:05:58 +00:00
ext/raw1394/gstdv1394src.c: Fix bus reset when using libiec61883
Original commit message from CVS: 2006-05-31 Zaheer Abbas Merali <zaheerabbas at merali dot org> * ext/raw1394/gstdv1394src.c: (gst_dv1394src_bus_reset): Fix bus reset when using libiec61883
This commit is contained in:
parent
1710bee58a
commit
e3d8e2e28c
3 changed files with 33 additions and 3 deletions
29
ChangeLog
29
ChangeLog
|
@ -1,3 +1,32 @@
|
||||||
|
2006-05-31 Zaheer Abbas Merali <zaheerabbas at merali dot org>
|
||||||
|
|
||||||
|
* ext/raw1394/gstdv1394src.c: (gst_dv1394src_bus_reset):
|
||||||
|
Fix bus reset when using libiec61883
|
||||||
|
|
||||||
|
2006-05-31 Zaheer Abbas Merali <zaheerabbas at merali dot org>
|
||||||
|
|
||||||
|
* configure.ac:
|
||||||
|
Detect libiec61883 and set necessary CFLAGS and LIBS for dv1394.
|
||||||
|
* ext/raw1394/Makefile.am:
|
||||||
|
Add CFLAGS.
|
||||||
|
* ext/raw1394/gstdv1394src.c: (gst_dv1394src_iec61883_receive),
|
||||||
|
New method, to receive using libiec61883.
|
||||||
|
(gst_dv1394src_iso_receive),
|
||||||
|
#ifdef'd out if libiec61883 is present.
|
||||||
|
(gst_dv1394src_bus_reset),
|
||||||
|
Get userdata correctly if using libiec61883.
|
||||||
|
(gst_dv1394src_create),
|
||||||
|
When using libiec61883, only poll one fd and no need to read.
|
||||||
|
(gst_dv1394src_discover_avc_node),
|
||||||
|
Replace g_warnings.
|
||||||
|
(gst_dv1394src_start),
|
||||||
|
Create new handle when we know which dv port. More reliable
|
||||||
|
than setting port on an existing handle. Initialise libiec61883.
|
||||||
|
(gst_dv1394src_stop):
|
||||||
|
If using libiec61883, then cleanup its handle properly.
|
||||||
|
* ext/raw1394/gstdv1394src.h:
|
||||||
|
Add libiec61883 handle.
|
||||||
|
|
||||||
2006-05-30 Sebastien Moutte <sebastien@moutte.net>
|
2006-05-30 Sebastien Moutte <sebastien@moutte.net>
|
||||||
|
|
||||||
* gst/avi/gstavidemux.c:
|
* gst/avi/gstavidemux.c:
|
||||||
|
|
2
common
2
common
|
@ -1 +1 @@
|
||||||
Subproject commit b0fd90b1cfb51107e8a511a1f3983a06bdd18638
|
Subproject commit 80b4e2c08717159760ebaa40715f8919b3f77ba9
|
|
@ -540,8 +540,9 @@ gst_dv1394src_bus_reset (raw1394handle_t handle, unsigned int generation)
|
||||||
|
|
||||||
#ifdef HAVE_LIBIEC61883
|
#ifdef HAVE_LIBIEC61883
|
||||||
iec61883_dv_t dv = (iec61883_dv_t) raw1394_get_userdata (handle);
|
iec61883_dv_t dv = (iec61883_dv_t) raw1394_get_userdata (handle);
|
||||||
|
iec61883_dv_fb_t dv_fb =
|
||||||
src = GST_DV1394SRC (iec61883_dv_get_callback_data (dv));
|
(iec61883_dv_fb_t) iec61883_dv_get_callback_data (dv);
|
||||||
|
src = GST_DV1394SRC (iec61883_dv_fb_get_callback_data (dv_fb));
|
||||||
#else
|
#else
|
||||||
src = GST_DV1394SRC (raw1394_get_userdata (handle));
|
src = GST_DV1394SRC (raw1394_get_userdata (handle));
|
||||||
#endif
|
#endif
|
||||||
|
|
Loading…
Reference in a new issue