diff options
| author | Zaheer Abbas Merali <zaheerabbas@merali.org> | 2006-05-31 15:37:16 +0000 |
|---|---|---|
| committer | Zaheer Abbas Merali <zaheerabbas@merali.org> | 2006-05-31 15:37:16 +0000 |
| commit | e3d8e2e28c131c3249a6cf58e38a75f284f089a0 (patch) | |
| tree | a3226da1b021280f13b1bc234e36351af3e7f6b4 | |
| parent | 1710bee58ad9eecda6c27db3bb7deec9cb13c5c7 (diff) | |
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
| -rw-r--r-- | ChangeLog | 29 | ||||
| m--------- | common | 0 | ||||
| -rw-r--r-- | ext/raw1394/gstdv1394src.c | 5 |
3 files changed, 32 insertions, 2 deletions
@@ -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> * gst/avi/gstavidemux.c: diff --git a/common b/common -Subproject b0fd90b1cfb51107e8a511a1f3983a06bdd1863 +Subproject 80b4e2c08717159760ebaa40715f8919b3f77ba diff --git a/ext/raw1394/gstdv1394src.c b/ext/raw1394/gstdv1394src.c index 79a819f7..c0100dfc 100644 --- a/ext/raw1394/gstdv1394src.c +++ b/ext/raw1394/gstdv1394src.c @@ -540,8 +540,9 @@ gst_dv1394src_bus_reset (raw1394handle_t handle, unsigned int generation) #ifdef HAVE_LIBIEC61883 iec61883_dv_t dv = (iec61883_dv_t) raw1394_get_userdata (handle); - - src = GST_DV1394SRC (iec61883_dv_get_callback_data (dv)); + iec61883_dv_fb_t dv_fb = + (iec61883_dv_fb_t) iec61883_dv_get_callback_data (dv); + src = GST_DV1394SRC (iec61883_dv_fb_get_callback_data (dv_fb)); #else src = GST_DV1394SRC (raw1394_get_userdata (handle)); #endif |