From c1ff34505bca5c90e85d18f9ba1973ad3658b7e0 Mon Sep 17 00:00:00 2001 From: Benjamin Otte Date: Fri, 7 May 2004 00:43:50 +0000 Subject: [PATCH] ext/lame/gstlame.c: simplify Original commit message from CVS: * ext/lame/gstlame.c: (gst_lame_chain): simplify * ext/mad/gstmad.c: (gst_mad_handle_event): fix event leak * gst/typefind/gsttypefindfunctions.c: (mp3_type_find): be able to detect mp3 files < 4096 bytes --- ChangeLog | 10 ++++++++++ ext/lame/gstlame.c | 14 ++++---------- ext/mad/gstmad.c | 3 +-- 3 files changed, 15 insertions(+), 12 deletions(-) diff --git a/ChangeLog b/ChangeLog index 73864698a2..465227e81d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2004-05-05 Benjamin Otte + + * ext/lame/gstlame.c: (gst_lame_chain): + simplify + * ext/mad/gstmad.c: (gst_mad_handle_event): + fix event leak + * gst/typefind/gsttypefindfunctions.c: (mp3_type_find): + be able to detect mp3 files < 4096 bytes + 2004-05-06 Wim Taymans * ext/theora/theoraenc.c: (gst_theora_enc_class_init), @@ -102,6 +111,7 @@ * ext/lame/gstlame.c: correct defaults that lame_init puts out of range +>>>>>>> 1.601 2004-05-03 Thomas Vander Stichele * ext/divx/gstdivxenc.c: (gst_divxenc_get_type), diff --git a/ext/lame/gstlame.c b/ext/lame/gstlame.c index c3e30b7cac..b145f7ed2b 100644 --- a/ext/lame/gstlame.c +++ b/ext/lame/gstlame.c @@ -797,16 +797,10 @@ gst_lame_chain (GstPad * pad, GstData * _data) ((GST_BUFFER_SIZE (buf) / (2 + lame->num_channels)) * 1.25) + 7200; mp3_data = g_malloc (mp3_buffer_size); - if (lame->num_channels == 2) { - mp3_size = lame_encode_buffer_interleaved (lame->lgf, - (short int *) (GST_BUFFER_DATA (buf)), - GST_BUFFER_SIZE (buf) / 4, mp3_data, mp3_buffer_size); - } else { - 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); - } + 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); GST_DEBUG ("encoded %d bytes of audio to %d bytes of mp3", GST_BUFFER_SIZE (buf), mp3_size); diff --git a/ext/mad/gstmad.c b/ext/mad/gstmad.c index 2105a4fb2f..559f865172 100644 --- a/ext/mad/gstmad.c +++ b/ext/mad/gstmad.c @@ -923,8 +923,6 @@ gst_mad_handle_event (GstPad * pad, GstBuffer * buffer) mad->total_samples = 0; } - gst_event_unref (event); - if (GST_PAD_IS_USABLE (mad->srcpad)) { discont = gst_event_new_discontinuous (FALSE, GST_FORMAT_TIME, time, NULL); @@ -936,6 +934,7 @@ gst_mad_handle_event (GstPad * pad, GstBuffer * buffer) mad->tempsize = 0; /* we don't need to restart when we get here */ mad->restart = FALSE; + gst_event_unref (event); break; } case GST_EVENT_EOS: