Original commit message from CVS:
* configure.ac:
Added mpegaudioparse
* ext/lame/gstlame.c: (gst_lame_src_getcaps),
(gst_lame_src_setcaps), (gst_lame_sink_setcaps),
(gst_lame_sink_event), (gst_lame_chain):
Some cleanups.
Fix memleak.
* gst/mpegaudioparse/gstmpegaudioparse.c:
(gst_mp3parse_class_init), (gst_mp3parse_init),
(gst_mp3parse_chain), (gst_mp3parse_change_state):
* gst/mpegaudioparse/gstmpegaudioparse.h:
Ported mpegaudioparse
gst_lame_chain (GstPad * pad, GstBuffer * buf)
{
GstLame *lame;
gst_lame_chain (GstPad * pad, GstBuffer * buf)
{
GstLame *lame;
- GstBuffer *outbuf;
- guchar *mp3_data = NULL;
- gint mp3_buffer_size, mp3_size = 0;
+ guchar *mp3_data;
+ gint mp3_buffer_size, mp3_size;
gint64 duration;
GstFlowReturn result;
gint64 duration;
GstFlowReturn result;
lame = GST_LAME (gst_pad_get_parent (pad));
lame = GST_LAME (gst_pad_get_parent (pad));
if (!lame->initialized)
goto not_initialized;
if (!lame->initialized)
goto not_initialized;
+ num_samples = GST_BUFFER_SIZE (buf) / 2;
+
/* 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 = 1.25 * num_samples + 7200;
mp3_data = g_malloc (mp3_buffer_size);
/* lame seems to be too stupid to get mono interleaved going */
mp3_data = g_malloc (mp3_buffer_size);
/* lame seems to be too stupid to get mono interleaved going */
mp3_size = lame_encode_buffer (lame->lgf,
(short int *) (GST_BUFFER_DATA (buf)),
(short int *) (GST_BUFFER_DATA (buf)),
mp3_size = lame_encode_buffer (lame->lgf,
(short int *) (GST_BUFFER_DATA (buf)),
(short int *) (GST_BUFFER_DATA (buf)),
- GST_BUFFER_SIZE (buf) / 2, mp3_data, mp3_buffer_size);
+ num_samples, mp3_data, mp3_buffer_size);
} else {
mp3_size = lame_encode_buffer_interleaved (lame->lgf,
(short int *) (GST_BUFFER_DATA (buf)),
} else {
mp3_size = lame_encode_buffer_interleaved (lame->lgf,
(short int *) (GST_BUFFER_DATA (buf)),
- GST_BUFFER_SIZE (buf) / 2 / lame->num_channels,
- mp3_data, mp3_buffer_size);
+ num_samples / lame->num_channels, mp3_data, mp3_buffer_size);
}
GST_LOG_OBJECT (lame, "encoded %d bytes of audio to %d bytes of mp3",
}
GST_LOG_OBJECT (lame, "encoded %d bytes of audio to %d bytes of mp3",
+ if (mp3_size < 0) {
+ g_warning ("error %d", mp3_size);
+ }
+
outbuf = gst_buffer_new ();
GST_BUFFER_DATA (outbuf) = mp3_data;
outbuf = gst_buffer_new ();
GST_BUFFER_DATA (outbuf) = mp3_data;
+ GST_BUFFER_MALLOCDATA (outbuf) = mp3_data;
GST_BUFFER_SIZE (outbuf) = mp3_size;
GST_BUFFER_TIMESTAMP (outbuf) = lame->last_ts;
GST_BUFFER_OFFSET (outbuf) = lame->last_offs;
GST_BUFFER_SIZE (outbuf) = mp3_size;
GST_BUFFER_TIMESTAMP (outbuf) = lame->last_ts;
GST_BUFFER_OFFSET (outbuf) = lame->last_offs;