mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-27 20:21:24 +00:00
Code Issues 1 Projects Releases Wiki Activity

mxfmpeg: Use the correct sound essence compression UL for MP3

Browse source 
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.
This commit is contained in:
Sebastian Dröge 2015-11-20 17:46:53 +02:00
parent adb01a23da
commit 73beb1834e
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
gst/mxf/mxfmpeg.c
View file

@ -600,7 +600,7 @@ static const MXFUL sound_essence_compression_mpeg1_layer1 = { {
0x03, 0x02, 0x04, 0x00} 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, 0x06, 0x0E, 0x2B, 0x34, 0x04, 0x01, 0x01, 0x01, 0x04, 0x02, 0x02, 0x02,
0x03, 0x02, 0x05, 0x00} 0x03, 0x02, 0x05, 0x00}
}; };
@ -732,7 +732,7 @@ mxf_mpeg_es_create_caps (MXFMetadataTimelineTrack * track, GstTagList ** tags,
"layer", G_TYPE_INT, 1, NULL); "layer", G_TYPE_INT, 1, NULL);
codec_name = "MPEG-1 Layer 1 Audio"; codec_name = "MPEG-1 Layer 1 Audio";
} else if (mxf_ul_is_equal (&s->sound_essence_compression, } else if (mxf_ul_is_equal (&s->sound_essence_compression,
&sound_essence_compression_mpeg1_layer12)) { &sound_essence_compression_mpeg1_layer23)) {
caps = caps =
gst_caps_new_simple ("audio/mpeg", "mpegversion", G_TYPE_INT, 1, gst_caps_new_simple ("audio/mpeg", "mpegversion", G_TYPE_INT, 1,
NULL); NULL);
@ -979,9 +979,9 @@ mxf_mpeg_audio_get_descriptor (GstPadTemplate * tmpl, GstCaps * caps,
if (mpegaudioversion == 1 && layer == 1) if (mpegaudioversion == 1 && layer == 1)
memcpy (&ret->sound_essence_compression, memcpy (&ret->sound_essence_compression,
&sound_essence_compression_mpeg1_layer1, 16); &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, memcpy (&ret->sound_essence_compression,
&sound_essence_compression_mpeg1_layer12, 16); &sound_essence_compression_mpeg1_layer23, 16);
else if (mpegaudioversion == 2 && layer == 1) else if (mpegaudioversion == 2 && layer == 1)
memcpy (&ret->sound_essence_compression, memcpy (&ret->sound_essence_compression,
&sound_essence_compression_mpeg2_layer1, 16); &sound_essence_compression_mpeg2_layer1, 16);