Commit 8e466b73 authored by Sebastian Dröge's avatar Sebastian Dröge 🍵

avcodecmap: Add special mapping for mono channel layouts

In ffmpeg this is the same as FRONT_CENTER, but we distinguish between
FRONT_CENTER and MONO in GStreamer. Add an explicit mapping for this special
case in the translations functions.

https://bugzilla.gnome.org/show_bug.cgi?id=759846
parent ae27b9c5
......@@ -99,6 +99,9 @@ gst_ffmpeg_channel_positions_to_layout (GstAudioChannelPosition * pos,
if (!pos)
return 0;
if (channels == 1 && pos[0] == GST_AUDIO_CHANNEL_POSITION_MONO)
return AV_CH_LAYOUT_MONO;
for (i = 0; i < channels; i++) {
for (j = 0; j < G_N_ELEMENTS (_ff_to_gst_layout); j++) {
if (_ff_to_gst_layout[j].gst == pos[i]) {
......@@ -127,6 +130,15 @@ gst_ffmpeg_channel_layout_to_gst (guint64 channel_layout, gint channels,
} else {
guint i, j;
/* Special path for mono, as AV_CH_LAYOUT_MONO is the same
* as FRONT_CENTER but we distinguish between the two in
* GStreamer
*/
if (channels == 1 && channel_layout == AV_CH_LAYOUT_MONO) {
pos[0] = GST_AUDIO_CHANNEL_POSITION_MONO;
return TRUE;
}
for (i = 0; i < 64; i++) {
if ((channel_layout & (G_GUINT64_CONSTANT (1) << i)) != 0) {
nchannels++;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment