mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-11-28 04:31:06 +00:00
Lame should accept events even when not negotiated yet.
Original commit message from CVS: Lame should accept events even when not negotiated yet.
This commit is contained in:
parent
5637fc0969
commit
bf5b28df37
1 changed files with 6 additions and 11 deletions
|
@ -683,17 +683,6 @@ gst_lame_chain (GstPad *pad, GstBuffer *buf)
|
||||||
|
|
||||||
GST_DEBUG (GST_CAT_PLUGIN_INFO, "entered chain");
|
GST_DEBUG (GST_CAT_PLUGIN_INFO, "entered chain");
|
||||||
|
|
||||||
if (!lame->initialized) {
|
|
||||||
gst_element_error (GST_ELEMENT (lame), "encoder not initialized (input is not audio?)");
|
|
||||||
if (GST_IS_EVENT (buf)) {
|
|
||||||
gst_pad_event_default (pad, GST_EVENT (buf));
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
gst_buffer_unref (buf);
|
|
||||||
}
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (GST_IS_EVENT (buf)) {
|
if (GST_IS_EVENT (buf)) {
|
||||||
switch (GST_EVENT_TYPE (buf)) {
|
switch (GST_EVENT_TYPE (buf)) {
|
||||||
case GST_EVENT_EOS:
|
case GST_EVENT_EOS:
|
||||||
|
@ -711,6 +700,12 @@ gst_lame_chain (GstPad *pad, GstBuffer *buf)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
|
if (!lame->initialized) {
|
||||||
|
gst_buffer_unref (buf);
|
||||||
|
gst_element_error (GST_ELEMENT (lame), "encoder not initialized (input is not audio?)");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
/* allocate space for output */
|
/* allocate space for output */
|
||||||
mp3_buffer_size = ((GST_BUFFER_SIZE(buf) / (2+lame->num_channels)) * 1.25) + 7200;
|
mp3_buffer_size = ((GST_BUFFER_SIZE(buf) / (2+lame->num_channels)) * 1.25) + 7200;
|
||||||
mp3_data = g_malloc (mp3_buffer_size);
|
mp3_data = g_malloc (mp3_buffer_size);
|
||||||
|
|
Loading…
Reference in a new issue