[gst-cvs] rbultje gst-plugins: gst-plugins/ gst-plugins/ext/vorbis/ gst-plugins/sys/v4l/

[<rb...@fr...>]

CVS Root:       /cvs/gstreamer
Module:         gst-plugins
Changes by:     rbultje
Date:           Mon Jan 10 2005  16:26:25 PST

Log message:
* ext/vorbis/vorbisdec.c: (vorbis_dec_chain):
Debug.
* sys/v4l/v4lsrc_calls.c: (gst_v4lsrc_grab_frame):
If we got a state change in the _get handler, don't return success.

Modified files:
    .               : ChangeLog
    ext/vorbis      : vorbisdec.c
    sys/v4l         : v4lsrc_calls.c

Links:
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins/ChangeLog.diff?r1=1.1508&r2=1.1509
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins/ext/vorbis/vorbisdec.c.diff?r1=1.52&r2=1.53
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins/sys/v4l/v4lsrc_calls.c.diff?r1=1.48&r2=1.49

====Begin Diffs====
Index: ChangeLog
===================================================================
RCS file: /cvs/gstreamer/gst-plugins/ChangeLog,v
retrieving revision 1.1508
retrieving revision 1.1509
diff -u -d -r1.1508 -r1.1509
--- ChangeLog	10 Jan 2005 22:00:15 -0000	1.1508
+++ ChangeLog	11 Jan 2005 00:26:13 -0000	1.1509
@@ -1,3 +1,10 @@
+2005-01-11  Ronald S. Bultje  <rb...@ro...>
+
+	* ext/vorbis/vorbisdec.c: (vorbis_dec_chain):
+	  Debug.
+	* sys/v4l/v4lsrc_calls.c: (gst_v4lsrc_grab_frame):
+	  If we got a state change in the _get handler, don't return success.
 2005-01-10  Stephane LOEUILLET  <ste...@ti...>
 
 	* ext/jpeg/gstjpegdec.c: (gst_jpegdec_my_output_message),
Index: vorbisdec.c
RCS file: /cvs/gstreamer/gst-plugins/ext/vorbis/vorbisdec.c,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -d -r1.52 -r1.53
--- vorbisdec.c	10 Jan 2005 18:45:53 -0000	1.52
+++ vorbisdec.c	11 Jan 2005 00:26:13 -0000	1.53
@@ -552,6 +552,8 @@
       GST_BUFFER_OFFSET_END (out) = vd->granulepos + sample_count;
       GST_BUFFER_TIMESTAMP (out) = vd->granulepos * GST_SECOND / vd->vi.rate;
       GST_BUFFER_DURATION (out) = sample_count * GST_SECOND / vd->vi.rate;
+      GST_DEBUG ("Pushing data of time %" GST_TIME_FORMAT,
+          GST_TIME_ARGS (GST_BUFFER_TIMESTAMP (out)));
       gst_pad_push (vd->srcpad, GST_DATA (out));
       vorbis_synthesis_read (&vd->vd, sample_count);
       vd->granulepos += sample_count;
Index: v4lsrc_calls.c
RCS file: /cvs/gstreamer/gst-plugins/sys/v4l/v4lsrc_calls.c,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -d -r1.48 -r1.49
--- v4lsrc_calls.c	23 Nov 2004 12:42:21 -0000	1.48
+++ v4lsrc_calls.c	11 Jan 2005 00:26:13 -0000	1.49
@@ -291,7 +291,7 @@
     }
     if (v4lsrc->quit) {
       g_mutex_unlock (v4lsrc->mutex_queue_state);
-      return TRUE;              /* it won't get through anyway */
+      return FALSE;
     if (!gst_v4lsrc_queue_frame (v4lsrc, v4lsrc->queue_frame)) {