mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-24 02:31:03 +00:00
Code Issues 1 Projects Releases Wiki Activity

flvdemux: Use aac codec-data to adjust channels if needed

Browse source 
Flv does not support various channels in AAC stream format, for example
flvdemux detect an audio channels of 2(stereo) when the AAC really is 1(mono).

https://bugzilla.gnome.org/show_bug.cgi?id=797275
This commit is contained in:
Yeongjin Jeong 2018-10-11 16:36:17 +09:00 committed by Olivier Crête
parent 7b5f7249e8
commit bd6a4aa10d
1 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
gst/flv/gstflvdemux.c
View file

@ -723,6 +723,7 @@ gst_flv_demux_audio_negotiate (GstFlvDemux * demux, guint32 codec_tag,
GstCaps *caps = NULL, *old_caps;
gboolean ret = FALSE;
guint adjusted_rate = rate;
guint adjusted_channels = channels;
GstEvent *event;
gchar *stream_id;
@ -784,6 +785,16 @@ gst_flv_demux_audio_negotiate (GstFlvDemux * demux, guint32 codec_tag,
} else {
adjusted_rate = rate;
}
adjusted_channels =
gst_codec_utils_aac_get_channels (map.data, map.size);
if (adjusted_channels && (channels != adjusted_channels)) {
GST_LOG_OBJECT (demux, "Ajusting AAC channels %d -> %d", channels,
adjusted_channels);
} else {
adjusted_channels = channels;
}
}
gst_buffer_unmap (demux->audio_codec_data, &map);
@ -866,7 +877,7 @@ gst_flv_demux_audio_negotiate (GstFlvDemux * demux, guint32 codec_tag,
}
gst_caps_set_simple (caps, "rate", G_TYPE_INT, adjusted_rate,
"channels", G_TYPE_INT, channels, NULL);
"channels", G_TYPE_INT, adjusted_channels, NULL);
if (demux->audio_codec_data) {
gst_caps_set_simple (caps, "codec_data", GST_TYPE_BUFFER,