mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-10-22 02:13:46 +00:00
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.
This commit is contained in:
parent
25bd959adb
commit
10d35563dd
2 changed files with 16 additions and 5 deletions
10
ChangeLog
10
ChangeLog
|
@ -1,3 +1,13 @@
|
||||||
|
2006-05-16 Tim-Philipp Müller <tim at centricular dot net>
|
||||||
|
|
||||||
|
* 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 <zaheerabbas at merali dot org>
|
2006-05-16 Zaheer Abbas Merali <zaheerabbas at merali dot org>
|
||||||
|
|
||||||
* gst/tcp/gsttcp.c: (gst_tcp_socket_read):
|
* gst/tcp/gsttcp.c: (gst_tcp_socket_read):
|
||||||
|
|
|
@ -108,11 +108,12 @@ gst_audio_check_channel_positions (const GstAudioChannelPosition * pos,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/* 0.8.x evilry */
|
/* Throw warning if we encounter an unusual 2-channel configuration,
|
||||||
if ((channels == 1 && pos[0] != GST_AUDIO_CHANNEL_POSITION_FRONT_MONO) ||
|
* at least until someone finds a reason why we should not */
|
||||||
(channels == 2 && (pos[0] != GST_AUDIO_CHANNEL_POSITION_FRONT_LEFT ||
|
if (channels == 2 && (pos[0] != GST_AUDIO_CHANNEL_POSITION_FRONT_LEFT ||
|
||||||
pos[1] != GST_AUDIO_CHANNEL_POSITION_FRONT_RIGHT))) {
|
pos[1] != GST_AUDIO_CHANNEL_POSITION_FRONT_RIGHT)) {
|
||||||
g_warning ("0.8.x: channels=1 implies mono; channels=2 implies stereo");
|
g_warning ("channels=2 implies stereo, but channel positions are "
|
||||||
|
"< %d, %d>", pos[0], pos[1]);
|
||||||
return FALSE;
|
return FALSE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue