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.
This commit is contained in:
Ronald S. Bultje 2005-01-11 00:26:13 +00:00
parent 2af93c12fa
commit e63860b014
3 changed files with 10 additions and 1 deletions

View file

@ -1,3 +1,10 @@
2005-01-11 Ronald S. Bultje <rbultje@ronald.bitfreak.net>
* 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 <stephane.loeuillet@tiscali.fr> 2005-01-10 Stephane LOEUILLET <stephane.loeuillet@tiscali.fr>
* ext/jpeg/gstjpegdec.c: (gst_jpegdec_my_output_message), * ext/jpeg/gstjpegdec.c: (gst_jpegdec_my_output_message),

View file

@ -552,6 +552,8 @@ vorbis_dec_chain (GstPad * pad, GstData * data)
GST_BUFFER_OFFSET_END (out) = vd->granulepos + sample_count; GST_BUFFER_OFFSET_END (out) = vd->granulepos + sample_count;
GST_BUFFER_TIMESTAMP (out) = vd->granulepos * GST_SECOND / vd->vi.rate; GST_BUFFER_TIMESTAMP (out) = vd->granulepos * GST_SECOND / vd->vi.rate;
GST_BUFFER_DURATION (out) = sample_count * 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)); gst_pad_push (vd->srcpad, GST_DATA (out));
vorbis_synthesis_read (&vd->vd, sample_count); vorbis_synthesis_read (&vd->vd, sample_count);
vd->granulepos += sample_count; vd->granulepos += sample_count;

View file

@ -291,7 +291,7 @@ gst_v4lsrc_grab_frame (GstV4lSrc * v4lsrc, gint * num)
} }
if (v4lsrc->quit) { if (v4lsrc->quit) {
g_mutex_unlock (v4lsrc->mutex_queue_state); 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)) { if (!gst_v4lsrc_queue_frame (v4lsrc, v4lsrc->queue_frame)) {
g_mutex_unlock (v4lsrc->mutex_queue_state); g_mutex_unlock (v4lsrc->mutex_queue_state);