From: Zaheer Abbas Merali <zaheerabbas@merali.org>
Date: Wed, 31 May 2006 15:37:16 +0000 (+0000)
Subject: ext/raw1394/gstdv1394src.c: Fix bus reset when using libiec61883
X-Git-Tag: RELEASE-0_10_5~424
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e3d8e2e28c131c3249a6cf58e38a75f284f089a0;p=platform%2Fupstream%2Fgst-plugins-good.git

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
---

diff --git a/ChangeLog b/ChangeLog
index a93893d..807cf45 100644
--- a/ChangeLog
+++ b/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>
 
 	* gst/avi/gstavidemux.c:
diff --git a/common b/common
index b0fd90b..80b4e2c 160000
--- a/common
+++ b/common
@@ -1 +1 @@
-Subproject commit b0fd90b1cfb51107e8a511a1f3983a06bdd18638
+Subproject commit 80b4e2c08717159760ebaa40715f8919b3f77ba9
diff --git a/ext/raw1394/gstdv1394src.c b/ext/raw1394/gstdv1394src.c
index 79a819f..c0100df 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