From c9e20af4cbfad51609b4f854af4681d6779c7cc0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Olivier=20Cr=C3=AAte?= Date: Thu, 9 May 2013 19:40:49 -0400 Subject: [PATCH] lamemp3enc: Tell GstAudioEncoder about the number of incoming samples lame does internal resampling, but the base class only cares about the number of raw samples, so tell finish frames about that, not the number of samples in the outgoing frame.: --- ext/lame/gstlamemp3enc.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/ext/lame/gstlamemp3enc.c b/ext/lame/gstlamemp3enc.c index 3c16b299fe..ee528beb49 100644 --- a/ext/lame/gstlamemp3enc.c +++ b/ext/lame/gstlamemp3enc.c @@ -653,6 +653,7 @@ gst_lamemp3enc_finish_frames (GstLameMP3Enc * lame) guint rate, version, layer, size; GstBuffer *mp3_buf; const guint8 *data; + guint samples_per_frame; data = gst_adapter_map (lame->adapter, 4); header = GST_READ_UINT32_BE (data); @@ -677,11 +678,18 @@ gst_lamemp3enc_finish_frames (GstLameMP3Enc * lame) break; } + /* Account for the internal resampling, finish frame really wants to + * know about the number of incoming samples + */ + samples_per_frame = (version == 1) ? 1152 : 576; + samples_per_frame *= lame->samplerate; + samples_per_frame /= lame->out_samplerate; + /* should be ok now */ mp3_buf = gst_adapter_take_buffer (lame->adapter, size); /* number of samples for MPEG-1, layer 3 */ result = gst_audio_encoder_finish_frame (GST_AUDIO_ENCODER (lame), - mp3_buf, version == 1 ? 1152 : 576); + mp3_buf, samples_per_frame); } exit: