Original commit message from CVS:
* 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>
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),
* ext/amrnb/amrnbdec.c: (gst_amrnbdec_init), (gst_amrnbdec_chain),
(gst_amrnbdec_state_change):
* ext/amrnb/amrnbenc.c: (gst_amrnbenc_base_init),
alpha = GST_ALPHA (GST_PAD_PARENT (pad));
alpha = GST_ALPHA (GST_PAD_PARENT (pad));
- GST_STREAM_LOCK (pad);
-
new_width = alpha->in_width;
new_height = alpha->in_height;
if (new_width != alpha->out_width ||
new_width = alpha->in_width;
new_height = alpha->in_height;
if (new_width != alpha->out_width ||
- new_height != alpha->out_height || !GST_RPAD_CAPS (alpha->srcpad)) {
+ new_height != alpha->out_height || !GST_PAD_CAPS (alpha->srcpad)) {
GstCaps *newcaps;
newcaps = gst_caps_copy (gst_pad_get_negotiated_caps (alpha->sinkpad));
GstCaps *newcaps;
newcaps = gst_caps_copy (gst_pad_get_negotiated_caps (alpha->sinkpad));
outbuf =
gst_buffer_new_and_alloc (ROUND_UP_2 (new_width) *
ROUND_UP_2 (new_height) * 4);
outbuf =
gst_buffer_new_and_alloc (ROUND_UP_2 (new_width) *
ROUND_UP_2 (new_height) * 4);
- gst_buffer_set_caps (outbuf, GST_RPAD_CAPS (alpha->srcpad));
+ gst_buffer_set_caps (outbuf, GST_PAD_CAPS (alpha->srcpad));
GST_BUFFER_TIMESTAMP (outbuf) = GST_BUFFER_TIMESTAMP (buffer);
GST_BUFFER_DURATION (outbuf) = GST_BUFFER_DURATION (buffer);
GST_BUFFER_TIMESTAMP (outbuf) = GST_BUFFER_TIMESTAMP (buffer);
GST_BUFFER_DURATION (outbuf) = GST_BUFFER_DURATION (buffer);
ret = gst_pad_push (alpha->srcpad, outbuf);
ret = gst_pad_push (alpha->srcpad, outbuf);
- GST_STREAM_UNLOCK (pad);
-
goom = GST_GOOM (GST_PAD_PARENT (pad));
goom = GST_GOOM (GST_PAD_PARENT (pad));
- GST_STREAM_LOCK (pad);
-
if (goom->channels == 0)
goto not_negotiated;
if (goom->channels == 0)
goto not_negotiated;
- if (GST_RPAD_CAPS (goom->srcpad) == NULL) {
+ if (GST_PAD_CAPS (goom->srcpad) == NULL) {
if (!gst_goom_src_negotiate (goom))
goto no_format;
}
if (!gst_goom_src_negotiate (goom))
goto no_format;
}
}
bufout = gst_pad_alloc_buffer (goom->srcpad, GST_BUFFER_OFFSET_NONE,
}
bufout = gst_pad_alloc_buffer (goom->srcpad, GST_BUFFER_OFFSET_NONE,
- goom->width * goom->height * 4, GST_RPAD_CAPS (goom->srcpad));
+ goom->width * goom->height * 4, GST_PAD_CAPS (goom->srcpad));
GST_BUFFER_TIMESTAMP (bufout) =
goom->audio_basetime +
(GST_SECOND * goom->samples_consumed / goom->sample_rate);
GST_BUFFER_TIMESTAMP (bufout) =
goom->audio_basetime +
(GST_SECOND * goom->samples_consumed / goom->sample_rate);
if (ret != GST_FLOW_OK)
break;
}
if (ret != GST_FLOW_OK)
break;
}
- GST_STREAM_UNLOCK (pad);
-
GST_ELEMENT_ERROR (goom, CORE, NEGOTIATION, (NULL),
("Format wasn't negotiated before chain function"));
gst_buffer_unref (bufin);
GST_ELEMENT_ERROR (goom, CORE, NEGOTIATION, (NULL),
("Format wasn't negotiated before chain function"));
gst_buffer_unref (bufin);
- GST_STREAM_UNLOCK (pad);
return GST_FLOW_NOT_NEGOTIATED;
}
no_format:
return GST_FLOW_NOT_NEGOTIATED;
}
no_format:
GST_ELEMENT_ERROR (goom, CORE, NEGOTIATION, (NULL),
("Could not negotiate format"));
gst_buffer_unref (bufin);
GST_ELEMENT_ERROR (goom, CORE, NEGOTIATION, (NULL),
("Could not negotiate format"));
gst_buffer_unref (bufin);
- GST_STREAM_UNLOCK (pad);
return GST_FLOW_ERROR;
}
}
return GST_FLOW_ERROR;
}
}