aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCarl Eugen Hoyos <cehoyos@ag.or.at>2011-04-14 01:10:18 +0200
committerCarl Eugen Hoyos <cehoyos@ag.or.at>2011-04-14 03:33:10 +0200
commit47c0c8ca9dba13618edce9da347f563ec1d9d811 (patch)
tree82f7f1f7f4e7c929d85b62a272cfb1405c13c6ec
parent1171d45f6cd3e6194bb3f3351b9945455da69538 (diff)
downloadffmpeg-47c0c8ca9dba13618edce9da347f563ec1d9d811.tar.gz
Also support alsa channel reordering for u16 and u32 formats.
-rw-r--r--libavdevice/alsa-audio-common.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/libavdevice/alsa-audio-common.c b/libavdevice/alsa-audio-common.c
index 0222729497..a6f3899ffe 100644
--- a/libavdevice/alsa-audio-common.c
+++ b/libavdevice/alsa-audio-common.c
@@ -129,6 +129,7 @@ static av_cold ff_reorder_func find_reorder_func(int codec_id,
int out)
{
return
+ codec_id == CODEC_ID_PCM_U16LE || codec_id == CODEC_ID_PCM_U16BE ||
codec_id == CODEC_ID_PCM_S16LE || codec_id == CODEC_ID_PCM_S16BE ?
layout == AV_CH_LAYOUT_5POINT0_BACK || layout == AV_CH_LAYOUT_5POINT0 ?
out ? alsa_reorder_int16_out_50 : NULL :
@@ -138,6 +139,7 @@ static av_cold ff_reorder_func find_reorder_func(int codec_id,
layout == AV_CH_LAYOUT_7POINT1 ?
out ? alsa_reorder_int16_out_71 : NULL :
NULL :
+ codec_id == CODEC_ID_PCM_U32LE || codec_id == CODEC_ID_PCM_U32BE ||
codec_id == CODEC_ID_PCM_S32LE || codec_id == CODEC_ID_PCM_S32BE ?
layout == AV_CH_LAYOUT_5POINT0_BACK || layout == AV_CH_LAYOUT_5POINT0 ?
out ? alsa_reorder_int32_out_50 : NULL :