From 10d35563dd2515ead21e1ba5180e0e12620d4102 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= Date: Tue, 16 May 2006 17:34:14 +0000 Subject: [PATCH] gst-libs/gst/audio/multichannel.c: It's okay to have caps with channels=1 and a channel position different from GST_A... Original commit message from CVS: * gst-libs/gst/audio/multichannel.c: (gst_audio_check_channel_positions): It's okay to have caps with channels=1 and a channel position different from GST_AUDIO_CHANNEL_POSITION_FRONT_MONO (deinterleavers might want to keep the position in the caps, so that they can be re-interleaved again properly later). Leave check for unexpected 2-channel layouts intact for now. --- ChangeLog | 10 ++++++++++ gst-libs/gst/audio/multichannel.c | 11 ++++++----- 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index f784aba700..89d394b442 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2006-05-16 Tim-Philipp Müller + + * gst-libs/gst/audio/multichannel.c: + (gst_audio_check_channel_positions): + It's okay to have caps with channels=1 and a channel position + different from GST_AUDIO_CHANNEL_POSITION_FRONT_MONO + (deinterleavers might want to keep the position in the caps, + so that they can be re-interleaved again properly later). + Leave check for unexpected 2-channel layouts intact for now. + 2006-05-16 Zaheer Abbas Merali * gst/tcp/gsttcp.c: (gst_tcp_socket_read): diff --git a/gst-libs/gst/audio/multichannel.c b/gst-libs/gst/audio/multichannel.c index c3d8a7391e..8d6c107db0 100644 --- a/gst-libs/gst/audio/multichannel.c +++ b/gst-libs/gst/audio/multichannel.c @@ -108,11 +108,12 @@ gst_audio_check_channel_positions (const GstAudioChannelPosition * pos, } } - /* 0.8.x evilry */ - if ((channels == 1 && pos[0] != GST_AUDIO_CHANNEL_POSITION_FRONT_MONO) || - (channels == 2 && (pos[0] != GST_AUDIO_CHANNEL_POSITION_FRONT_LEFT || - pos[1] != GST_AUDIO_CHANNEL_POSITION_FRONT_RIGHT))) { - g_warning ("0.8.x: channels=1 implies mono; channels=2 implies stereo"); + /* Throw warning if we encounter an unusual 2-channel configuration, + * at least until someone finds a reason why we should not */ + if (channels == 2 && (pos[0] != GST_AUDIO_CHANNEL_POSITION_FRONT_LEFT || + pos[1] != GST_AUDIO_CHANNEL_POSITION_FRONT_RIGHT)) { + g_warning ("channels=2 implies stereo, but channel positions are " + "< %d, %d>", pos[0], pos[1]); return FALSE; }