mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-06-07 07:58:51 +00:00
Code Issues 1 Projects Releases Wiki Activity

mssdemux: add depth field to audio caps if available

Browse source 
depth field can be retrieved from "BitsPerSample" or
from "WaveFormatEx" structure, if provided in Manifest

https://bugzilla.gnome.org/show_bug.cgi?id=758586
This commit is contained in:
Maroš Ondrášek 2015-11-24 11:50:51 +01:00 committed by Thiago Santos
parent c681c33d10
commit b902c4a293
1 changed files with 11 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
ext/smoothstreaming/gstmssmanifest.c
View file

@ -700,11 +700,13 @@ _gst_mss_stream_audio_caps_from_qualitylevel_xml (GstMssStreamQuality * q)
gchar *audiotag = (gchar *) xmlGetProp (node, (xmlChar *) "AudioTag"); gchar *audiotag = (gchar *) xmlGetProp (node, (xmlChar *) "AudioTag");
gchar *channels_str = (gchar *) xmlGetProp (node, (xmlChar *) "Channels"); gchar *channels_str = (gchar *) xmlGetProp (node, (xmlChar *) "Channels");
gchar *rate_str = (gchar *) xmlGetProp (node, (xmlChar *) "SamplingRate"); gchar *rate_str = (gchar *) xmlGetProp (node, (xmlChar *) "SamplingRate");
gchar *depth_str = (gchar *) xmlGetProp (node, (xmlChar *) "BitsPerSample");
gchar *block_align_str = gchar *block_align_str =
(gchar *) xmlGetProp (node, (xmlChar *) "PacketSize"); (gchar *) xmlGetProp (node, (xmlChar *) "PacketSize");
gchar *codec_data_str = gchar *codec_data_str =
(gchar *) xmlGetProp (node, (xmlChar *) "CodecPrivateData"); (gchar *) xmlGetProp (node, (xmlChar *) "CodecPrivateData");
GstBuffer *codec_data = NULL; GstBuffer *codec_data = NULL;
gint depth = 0;
gint block_align = 0; gint block_align = 0;
gint rate = 0; gint rate = 0;
gint channels = 0; gint channels = 0;
@ -732,6 +734,8 @@ _gst_mss_stream_audio_caps_from_qualitylevel_xml (GstMssStreamQuality * q)
rate = (gint) g_ascii_strtoull (rate_str, NULL, 10); rate = (gint) g_ascii_strtoull (rate_str, NULL, 10);
if (channels_str) if (channels_str)
channels = (int) g_ascii_strtoull (channels_str, NULL, 10); channels = (int) g_ascii_strtoull (channels_str, NULL, 10);
if (depth_str)
depth = (gint) g_ascii_strtoull (depth_str, NULL, 10);
if (block_align_str) if (block_align_str)
block_align = (int) g_ascii_strtoull (block_align_str, NULL, 10); block_align = (int) g_ascii_strtoull (block_align_str, NULL, 10);
@ -758,6 +762,9 @@ _gst_mss_stream_audio_caps_from_qualitylevel_xml (GstMssStreamQuality * q)
if (!block_align) { if (!block_align) {
block_align = GST_READ_UINT16_LE (mapinfo.data + 12); block_align = GST_READ_UINT16_LE (mapinfo.data + 12);
} }
if (!depth) {
depth = GST_READ_UINT16_LE (mapinfo.data + 14);
}
gst_buffer_unmap (codec_data, &mapinfo); gst_buffer_unmap (codec_data, &mapinfo);
/* Consume all the WAVEFORMATEX structure, and pass only the rest of /* Consume all the WAVEFORMATEX structure, and pass only the rest of
@ -784,6 +791,9 @@ _gst_mss_stream_audio_caps_from_qualitylevel_xml (GstMssStreamQuality * q)
if (rate) if (rate)
gst_structure_set (structure, "rate", G_TYPE_INT, rate, NULL); gst_structure_set (structure, "rate", G_TYPE_INT, rate, NULL);
if (depth)
gst_structure_set (structure, "depth", G_TYPE_INT, depth, NULL);
if (q->bitrate) if (q->bitrate)
gst_structure_set (structure, "bitrate", G_TYPE_INT, (int) q->bitrate, gst_structure_set (structure, "bitrate", G_TYPE_INT, (int) q->bitrate,
NULL); NULL);
@ -799,6 +809,7 @@ end:
xmlFree (audiotag); xmlFree (audiotag);
xmlFree (channels_str); xmlFree (channels_str);
xmlFree (rate_str); xmlFree (rate_str);
xmlFree (depth_str);
xmlFree (block_align_str); xmlFree (block_align_str);
xmlFree (codec_data_str); xmlFree (codec_data_str);