From e63860b014380b9e3eb79241ef631cc58484d9ef Mon Sep 17 00:00:00 2001 From: "Ronald S. Bultje" Date: Tue, 11 Jan 2005 00:26:13 +0000 Subject: [PATCH] ext/vorbis/vorbisdec.c: Debug. Original commit message from CVS: * 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. --- ChangeLog | 7 +++++++ ext/vorbis/vorbisdec.c | 2 ++ sys/v4l/v4lsrc_calls.c | 2 +- 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 422c3df..deb05c0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2005-01-11 Ronald S. Bultje + + * 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 * ext/jpeg/gstjpegdec.c: (gst_jpegdec_my_output_message), diff --git a/ext/vorbis/vorbisdec.c b/ext/vorbis/vorbisdec.c index 5a9dcaf..ca9759b 100644 --- a/ext/vorbis/vorbisdec.c +++ b/ext/vorbis/vorbisdec.c @@ -552,6 +552,8 @@ vorbis_dec_chain (GstPad * pad, GstData * data) 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; diff --git a/sys/v4l/v4lsrc_calls.c b/sys/v4l/v4lsrc_calls.c index bf45447..c816fe6 100644 --- a/sys/v4l/v4lsrc_calls.c +++ b/sys/v4l/v4lsrc_calls.c @@ -291,7 +291,7 @@ gst_v4lsrc_grab_frame (GstV4lSrc * v4lsrc, gint * num) } 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)) { g_mutex_unlock (v4lsrc->mutex_queue_state); -- 2.7.4