summaryrefslogtreecommitdiff
path: root/ext/libav/gstavcodecmap.c
diff options
context:
space:
mode:
Diffstat (limited to 'ext/libav/gstavcodecmap.c')
-rw-r--r--ext/libav/gstavcodecmap.c30
1 files changed, 30 insertions, 0 deletions
diff --git a/ext/libav/gstavcodecmap.c b/ext/libav/gstavcodecmap.c
index be22f22..d0421c9 100644
--- a/ext/libav/gstavcodecmap.c
+++ b/ext/libav/gstavcodecmap.c
@@ -1233,6 +1233,21 @@ gst_ffmpeg_codecid_to_caps (enum AVCodecID codec_id,
break;
}
+ case AV_CODEC_ID_XMA1:
+ {
+ caps =
+ gst_ff_aud_caps_new (context, NULL, codec_id, encode, "audio/x-xma",
+ "xmaversion", G_TYPE_INT, 1, NULL);
+ break;
+ }
+ case AV_CODEC_ID_XMA2:
+ {
+ caps =
+ gst_ff_aud_caps_new (context, NULL, codec_id, encode, "audio/x-xma",
+ "xmaversion", G_TYPE_INT, 2, NULL);
+ break;
+ }
+
case AV_CODEC_ID_MACE3:
case AV_CODEC_ID_MACE6:
{
@@ -3997,6 +4012,21 @@ gst_ffmpeg_caps_to_codecid (const GstCaps * caps, AVCodecContext * context)
}
if (id != AV_CODEC_ID_NONE)
audio = TRUE;
+ } else if (!strcmp (mimetype, "audio/x-xma")) {
+ gint xmaversion = 0;
+
+ if (gst_structure_get_int (structure, "xmaversion", &xmaversion)) {
+ switch (xmaversion) {
+ case 1:
+ id = AV_CODEC_ID_XMA1;
+ break;
+ case 2:
+ id = AV_CODEC_ID_XMA2;
+ break;
+ }
+ }
+ if (id != AV_CODEC_ID_NONE)
+ audio = TRUE;
} else if (!strcmp (mimetype, "audio/x-wms")) {
id = AV_CODEC_ID_WMAVOICE;
audio = TRUE;