summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVincent Penquerc'h <vincent.penquerch@collabora.co.uk>2016-02-04 15:59:04 +0000
committerSebastian Dröge <sebastian@centricular.com>2016-02-23 10:47:43 +0200
commit6861d11c49ea0f30d2432cf4ebf6108bc89897f1 (patch)
tree51fc1205b17d11386999aba72bf0f957ba9ec00a
parent565607107f7d19e360faa379a7c19a68d140b1d9 (diff)
downloadgstreamer-plugins-good-6861d11c49ea0f30d2432cf4ebf6108bc89897f1.tar.gz
matroska-demux: make up an OpusHead block if possible when missing
https://bugzilla.gnome.org/show_bug.cgi?id=761489
-rw-r--r--gst/matroska/matroska-demux.c31
1 files changed, 30 insertions, 1 deletions
diff --git a/gst/matroska/matroska-demux.c b/gst/matroska/matroska-demux.c
index 96700494a..f176ce0c6 100644
--- a/gst/matroska/matroska-demux.c
+++ b/gst/matroska/matroska-demux.c
@@ -5614,8 +5614,37 @@ gst_matroska_demux_audio_caps (GstMatroskaTrackAudioContext *
caps = gst_codec_utils_opus_create_caps_from_header (tmp, NULL);
gst_buffer_unref (tmp);
*codec_name = g_strdup ("Opus");
+ } else if (context->codec_priv_size == 0) {
+ GST_WARNING ("No Opus codec data found, trying to create one");
+ if (audiocontext->channels >= 0 && audiocontext->channels <= 2) {
+ guint8 streams, coupled, channels;
+ guint32 samplerate;
+
+ samplerate =
+ audiocontext->samplerate == 0 ? 48000 : audiocontext->samplerate;
+ channels = audiocontext->channels == 0 ? 2 : audiocontext->channels;
+ if (channels == 1) {
+ streams = 1;
+ coupled = 0;
+ } else {
+ streams = 1;
+ coupled = 1;
+ }
+
+ caps =
+ gst_codec_utils_opus_create_caps (samplerate, channels, 0, streams,
+ coupled, NULL);
+ if (caps) {
+ *codec_name = g_strdup ("Opus");
+ } else {
+ GST_WARNING ("Failed to create Opus caps from audio context");
+ }
+ } else {
+ GST_WARNING ("No Opus codec data, and not enough info to create one");
+ }
} else {
- GST_WARNING ("Invalid Opus codec data size");
+ GST_WARNING ("Invalid Opus codec data size (got %" G_GSIZE_FORMAT
+ ", expected 19)", context->codec_priv_size);
}
} else if (!strcmp (codec_id, GST_MATROSKA_CODEC_ID_AUDIO_ACM)) {
gst_riff_strf_auds auds;