2005-05-25 Wim Taymans <wim@fluendo.com>
+ * ext/mad/gstmad.c: (gst_mad_chain), (gst_mad_change_state):
+ * ext/sidplay/gstsiddec.cc:
+ * gst/alpha/gstalpha.c: (gst_alpha_chain):
+ * gst/goom/gstgoom.c: (gst_goom_chain):
+ No need to take the lock anymore, core already did
+ that before calling us.
+
+2005-05-25 Wim Taymans <wim@fluendo.com>
+
* ext/amrnb/amrnbdec.c: (gst_amrnbdec_init), (gst_amrnbdec_chain),
(gst_amrnbdec_state_change):
* ext/amrnb/amrnbenc.c: (gst_amrnbenc_base_init),
mad = GST_MAD (GST_PAD_PARENT (pad));
g_return_val_if_fail (GST_IS_MAD (mad), GST_FLOW_ERROR);
- GST_STREAM_LOCK (pad);
-
/* restarts happen on discontinuities, ie. seek, flush, PAUSED to PLAYING */
if (gst_mad_check_restart (mad))
GST_DEBUG ("mad restarted");
result = GST_FLOW_OK;
end:
- GST_STREAM_UNLOCK (pad);
gst_buffer_unref (buffer);
return result;
gst_mad_change_state (GstElement * element)
{
GstMad *mad;
+ GstElementStateReturn ret;
+ gint transition;
mad = GST_MAD (element);
+ transition = GST_STATE_TRANSITION (element);
- switch (GST_STATE_TRANSITION (element)) {
+ switch (transition) {
case GST_STATE_NULL_TO_READY:
break;
case GST_STATE_READY_TO_PAUSED:
break;
}
case GST_STATE_PAUSED_TO_PLAYING:
- /* do something to get out of the chain function faster */
break;
+ default:
+ break;
+ }
+
+ ret = parent_class->change_state (element);
+
+ switch (transition) {
case GST_STATE_PLAYING_TO_PAUSED:
break;
case GST_STATE_PAUSED_TO_READY:
- GST_STREAM_LOCK (mad->sinkpad);
mad_synth_finish (&mad->synth);
mad_frame_finish (&mad->frame);
mad_stream_finish (&mad->stream);
gst_tag_list_free (mad->tags);
mad->tags = NULL;
}
- GST_STREAM_UNLOCK (mad->sinkpad);
break;
case GST_STATE_READY_TO_NULL:
break;
+ default:
+ break;
}
-
- return parent_class->change_state (element);
+ return ret;
}
siddec = GST_SIDDEC (GST_PAD_PARENT (pad));
- GST_STREAM_LOCK (pad);
out = gst_buffer_new_and_alloc (siddec->blocksize);
gst_buffer_set_caps (out, GST_PAD_CAPS (pad));
if ((ret = gst_pad_push (siddec->srcpad, out)) != GST_FLOW_OK)
goto pause;
- GST_STREAM_UNLOCK (pad);
-
return;
pause:
{
- gst_task_pause (GST_RPAD_TASK (pad));
- GST_STREAM_UNLOCK (pad);
+ gst_pad_pause_task (pad);
}
}
siddec->tune_number))
goto could_not_init;
- if (GST_ELEMENT_SCHEDULER (siddec)) {
- GST_STREAM_LOCK (siddec->srcpad);
- GST_RPAD_TASK (siddec->srcpad) =
- gst_scheduler_create_task (GST_ELEMENT_SCHEDULER (siddec),
- (GstTaskFunction) play_loop, siddec->srcpad);
-
- gst_task_start (GST_RPAD_TASK (siddec->srcpad));
- GST_STREAM_UNLOCK (siddec->srcpad);
- res = TRUE;
- }
+ res = gst_pad_start_task (siddec->srcpad,
+ (GstTaskFunction) play_loop, siddec->srcpad);
return res;
/* ERRORS */
if (siddec->tune_len + size > maxSidtuneFileLen)
goto overflow;
- GST_STREAM_LOCK (pad);
-
memcpy (siddec->tune_buffer + siddec->tune_len, GST_BUFFER_DATA (buffer),
size);
siddec->tune_len += size;
- GST_STREAM_UNLOCK (pad);
-
gst_buffer_unref (buffer);
return GST_FLOW_OK;