FaSTTUBe/GST-Tensordecoder-ov_ep
37
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

gst-libs/gst/audio/gstbaseaudiosink.c: Undo previous commit, it breaks resume after pause.

Browse Source 
Original commit message from CVS:
* gst-libs/gst/audio/gstbaseaudiosink.c:
(gst_base_audio_sink_render), (gst_base_audio_sink_change_state):
Undo previous commit, it breaks resume after pause.
This commit is contained in:
Wim Taymans 2006-01-25 10:50:32 +00:00
parent 2bc5ca1786
commit ccd05fa086
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
2006-01-25 Wim Taymans <wim@fluendo.com>
* gst-libs/gst/audio/gstbaseaudiosink.c:
(gst_base_audio_sink_render), (gst_base_audio_sink_change_state):
Undo previous commit that returned WRONG_STATE sooner, it breaks
resume after pause.
2006-01-25 Wim Taymans <wim@fluendo.com> 2006-01-25 Wim Taymans <wim@fluendo.com>
* gst-libs/gst/audio/gstbaseaudiosink.c: * gst-libs/gst/audio/gstbaseaudiosink.c:

8
gst-libs/gst/audio/gstbaseaudiosink.c
View File

@ -536,8 +536,6 @@ no_sync:
sink->next_sample = render_offset + samples; sink->next_sample = render_offset + samples;
samples = gst_ring_buffer_commit (ringbuf, render_offset, data, samples); samples = gst_ring_buffer_commit (ringbuf, render_offset, data, samples);
if (samples == -1)
goto stopping;
if (GST_CLOCK_TIME_IS_VALID (stop) && stop >= bsink->segment.stop) { if (GST_CLOCK_TIME_IS_VALID (stop) && stop >= bsink->segment.stop) {
GST_DEBUG_OBJECT (sink, GST_DEBUG_OBJECT (sink,
@ -570,11 +568,6 @@ wrong_size:
("sink received buffer of wrong size.")); ("sink received buffer of wrong size."));
return GST_FLOW_ERROR; return GST_FLOW_ERROR;
} }
stopping:
{
GST_DEBUG_OBJECT (sink, "ringbuffer is stopping");
return GST_FLOW_WRONG_STATE;
}
} }
GstRingBuffer * GstRingBuffer *
@ -625,6 +618,7 @@ gst_base_audio_sink_change_state (GstElement * element,
{ {
GstClock *clock; GstClock *clock;
/* FIXME, only start slaving when we really start the ringbuffer */
GST_OBJECT_LOCK (sink); GST_OBJECT_LOCK (sink);
clock = GST_ELEMENT_CLOCK (sink); clock = GST_ELEMENT_CLOCK (sink);
/* if we are slaved to a clock, we need to set the initial /* if we are slaved to a clock, we need to set the initial