From 73beb1834eb8df54316c9fcd1c72e94c95a8196c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= Date: Fri, 20 Nov 2015 17:46:53 +0200 Subject: [PATCH] mxfmpeg: Use the correct sound essence compression UL for MP3 There's one for MPEG 1 Layer 1 and one for Layer 2 and 3. We previously had the second for Layer 1 and 2 and nothing for Layer 3, which was wrong. --- gst/mxf/mxfmpeg.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gst/mxf/mxfmpeg.c b/gst/mxf/mxfmpeg.c index 7b57d4ded0..da357223ba 100644 --- a/gst/mxf/mxfmpeg.c +++ b/gst/mxf/mxfmpeg.c @@ -600,7 +600,7 @@ static const MXFUL sound_essence_compression_mpeg1_layer1 = { { 0x03, 0x02, 0x04, 0x00} }; -static const MXFUL sound_essence_compression_mpeg1_layer12 = { { +static const MXFUL sound_essence_compression_mpeg1_layer23 = { { 0x06, 0x0E, 0x2B, 0x34, 0x04, 0x01, 0x01, 0x01, 0x04, 0x02, 0x02, 0x02, 0x03, 0x02, 0x05, 0x00} }; @@ -732,7 +732,7 @@ mxf_mpeg_es_create_caps (MXFMetadataTimelineTrack * track, GstTagList ** tags, "layer", G_TYPE_INT, 1, NULL); codec_name = "MPEG-1 Layer 1 Audio"; } else if (mxf_ul_is_equal (&s->sound_essence_compression, - &sound_essence_compression_mpeg1_layer12)) { + &sound_essence_compression_mpeg1_layer23)) { caps = gst_caps_new_simple ("audio/mpeg", "mpegversion", G_TYPE_INT, 1, NULL); @@ -979,9 +979,9 @@ mxf_mpeg_audio_get_descriptor (GstPadTemplate * tmpl, GstCaps * caps, if (mpegaudioversion == 1 && layer == 1) memcpy (&ret->sound_essence_compression, &sound_essence_compression_mpeg1_layer1, 16); - else if (mpegaudioversion == 1 && layer == 2) + else if (mpegaudioversion == 1 && (layer == 2 || layer == 3)) memcpy (&ret->sound_essence_compression, - &sound_essence_compression_mpeg1_layer12, 16); + &sound_essence_compression_mpeg1_layer23, 16); else if (mpegaudioversion == 2 && layer == 1) memcpy (&ret->sound_essence_compression, &sound_essence_compression_mpeg2_layer1, 16);