diff options
| author | Sebastian Dröge <sebastian@centricular.com> | 2017-01-05 15:05:07 +0200 |
|---|---|---|
| committer | Sebastian Dröge <sebastian@centricular.com> | 2017-01-05 15:05:42 +0200 |
| commit | 9988ad9c42d7cc939f03e8df5c865599600597d0 (patch) | |
| tree | 0c37665e6d576d6f352346877d3b3b3788993b1b | |
| parent | 8b46e1b95a0d31669180d3070a104bceba694d28 (diff) | |
| download | gstreamer-plugins-bad-9988ad9c42d7cc939f03e8df5c865599600597d0.tar.gz | |
androidmedia: Add support for Opus in the decoder
| -rw-r--r-- | sys/androidmedia/gstamc.c | 5 | ||||
| -rw-r--r-- | sys/androidmedia/gstamcaudiodec.c | 2 |
2 files changed, 7 insertions, 0 deletions
diff --git a/sys/androidmedia/gstamc.c b/sys/androidmedia/gstamc.c index 10ce31038..3a568e759 100644 --- a/sys/androidmedia/gstamc.c +++ b/sys/androidmedia/gstamc.c @@ -3536,6 +3536,11 @@ gst_amc_codec_info_to_caps (const GstAmcCodecInfo * codec_info, "rate", GST_TYPE_INT_RANGE, 1, G_MAXINT, "channels", GST_TYPE_INT_RANGE, 1, G_MAXINT, NULL); encoded_ret = gst_caps_merge_structure (encoded_ret, tmp); + } else if (strcmp (type->mime, "audio/opus") == 0) { + tmp = gst_structure_new ("audio/x-opus", + "rate", GST_TYPE_INT_RANGE, 1, G_MAXINT, + "channels", GST_TYPE_INT_RANGE, 1, G_MAXINT, NULL); + encoded_ret = gst_caps_merge_structure (encoded_ret, tmp); } else if (strcmp (type->mime, "audio/flac") == 0) { tmp = gst_structure_new ("audio/x-flac", "rate", GST_TYPE_INT_RANGE, 1, G_MAXINT, diff --git a/sys/androidmedia/gstamcaudiodec.c b/sys/androidmedia/gstamcaudiodec.c index f46df7b09..29a03e11f 100644 --- a/sys/androidmedia/gstamcaudiodec.c +++ b/sys/androidmedia/gstamcaudiodec.c @@ -156,6 +156,8 @@ caps_to_mime (GstCaps * caps) return "audio/g711-mlaw"; } else if (strcmp (name, "audio/x-vorbis") == 0) { return "audio/vorbis"; + } else if (strcmp (name, "audio/x-opus") == 0) { + return "audio/opus"; } return NULL; |