From a9d5e7b74fd8ba9531a42bacdd90ee76c5ef8fdb Mon Sep 17 00:00:00 2001 From: "Arwed v. Merkatz" Date: Mon, 6 Dec 2004 19:32:33 +0000 Subject: [PATCH] set correct buffer durations in mp3parse, set default_duration in matroskamux for mpeg1 audio Original commit message from CVS: set correct buffer durations in mp3parse, set default_duration in matroskamux for mpeg1 audio --- ChangeLog | 7 +++++++ gst/matroska/matroska-mux.c | 6 ++++++ 2 files changed, 13 insertions(+) diff --git a/ChangeLog b/ChangeLog index d04f64d3f0..12c053a83f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2004-12-06 Arwed v. Merkatz + + * gst/mpegaudioparse/gstmpegaudioparse.c: (gst_mp3parse_chain): + set BUFFER_DURATION to correct values (mpeg1 audio frame length is fixed) + * gst/matroska/matroska-mux.c: (gst_matroska_mux_audio_pad_link): + set default_duration for mpeg1 audio + 2004-12-06 Benjamin Otte * ext/alsa/gstalsa.c: (gst_alsa_get_caps), (gst_alsa_close_audio): diff --git a/gst/matroska/matroska-mux.c b/gst/matroska/matroska-mux.c index 2aded2664b..0a9ff29c9d 100644 --- a/gst/matroska/matroska-mux.c +++ b/gst/matroska/matroska-mux.c @@ -526,12 +526,18 @@ gst_matroska_mux_audio_pad_link (GstPad * pad, const GstCaps * caps) switch (layer) { case 1: context->codec_id = g_strdup (GST_MATROSKA_CODEC_ID_AUDIO_MPEG1_L1); + context->default_duration = + 384 * GST_SECOND / audiocontext->samplerate; break; case 2: context->codec_id = g_strdup (GST_MATROSKA_CODEC_ID_AUDIO_MPEG1_L2); + context->default_duration = + 1152 * GST_SECOND / audiocontext->samplerate; break; case 3: context->codec_id = g_strdup (GST_MATROSKA_CODEC_ID_AUDIO_MPEG1_L3); + context->default_duration = + 1152 * GST_SECOND / audiocontext->samplerate; break; } break;