summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastian Dröge <slomo@circular-chaos.org>2008-12-07 17:57:13 +0000
committerSebastian Dröge <slomo@circular-chaos.org>2008-12-07 17:57:13 +0000
commit8932df4eef2b5bfadfd4d0fc60eed393d29fb09e (patch)
tree581a7b08fe0df3d0a8b74de23f6d509f22ee27cf
parentabcc8554971b964ee697a158043afe213798af71 (diff)
gst/mxf/mxfmpeg.c: Set codec name tags for the MPEG audio essence.
Original commit message from CVS: * gst/mxf/mxfmpeg.c: (mxf_mpeg_es_create_caps): Set codec name tags for the MPEG audio essence.
-rw-r--r--ChangeLog5
-rw-r--r--gst/mxf/mxfmpeg.c7
2 files changed, 12 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index a66bf9e41..b0b20a812 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2008-12-07 Sebastian Dröge <sebastian.droege@collabora.co.uk>
+ * gst/mxf/mxfmpeg.c: (mxf_mpeg_es_create_caps):
+ Set codec name tags for the MPEG audio essence.
+
+2008-12-07 Sebastian Dröge <sebastian.droege@collabora.co.uk>
+
* gst/mxf/Makefile.am:
* gst/mxf/mxfdemux.c:
(gst_mxf_demux_handle_header_metadata_update_streams):
diff --git a/gst/mxf/mxfmpeg.c b/gst/mxf/mxfmpeg.c
index ba3c2d8ee..810474a4f 100644
--- a/gst/mxf/mxfmpeg.c
+++ b/gst/mxf/mxfmpeg.c
@@ -366,32 +366,39 @@ mxf_mpeg_es_create_caps (MXFMetadataGenericPackage * package,
caps =
gst_caps_new_simple ("audio/mpeg", "mpegversion", G_TYPE_INT, 1,
NULL);
+ codec_name = "MPEG-1 Audio";
} else if (mxf_ul_is_equal (&s->sound_essence_compression,
&sound_essence_compression_ac3)) {
caps = gst_caps_new_simple ("audio/ac3", NULL);
+ codec_name = "AC3 Audio";
} else if (mxf_ul_is_equal (&s->sound_essence_compression,
&sound_essence_compression_mpeg1_layer1)) {
caps =
gst_caps_new_simple ("audio/mpeg", "mpegversion", G_TYPE_INT, 1,
"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)) {
caps =
gst_caps_new_simple ("audio/mpeg", "mpegversion", G_TYPE_INT, 1,
NULL);
+ codec_name = "MPEG-1 Audio";
} else if (mxf_ul_is_equal (&s->sound_essence_compression,
&sound_essence_compression_mpeg1_layer2)) {
caps =
gst_caps_new_simple ("audio/mpeg", "mpegversion", G_TYPE_INT, 1,
"layer", G_TYPE_INT, 2, NULL);
+ codec_name = "MPEG-1 Layer 2 Audio";
} else if (mxf_ul_is_equal (&s->sound_essence_compression,
&sound_essence_compression_mpeg2_layer1)) {
caps =
gst_caps_new_simple ("audio/mpeg", "mpegversion", G_TYPE_INT, 1,
"layer", G_TYPE_INT, 1, "mpegaudioversion", G_TYPE_INT, 2, NULL);
+ codec_name = "MPEG-2 Layer 1 Audio";
} else if (mxf_ul_is_equal (&s->sound_essence_compression,
&sound_essence_compression_dts)) {
caps = gst_caps_new_simple ("audio/x-dts", NULL);
+ codec_name = "Dolby DTS Audio";
}
if (caps) {