diff options
| author | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2011-04-14 04:16:53 +0200 |
|---|---|---|
| committer | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2011-04-14 04:16:53 +0200 |
| commit | b8a44442660cb55012951151b2a462923bdcea22 (patch) | |
| tree | 67b8745e5d204c4faa01e24b5236708a8f56b613 | |
| parent | 6daf513cf24a99ddddb7e748fc150f37bcd323f3 (diff) | |
| download | ffmpeg-b8a44442660cb55012951151b2a462923bdcea22.tar.gz | |
AV_CH_LAYOUT_2_2 does not need channel reordering for alsa output.
| -rw-r--r-- | libavdevice/alsa-audio-common.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/libavdevice/alsa-audio-common.c b/libavdevice/alsa-audio-common.c index a158e8efc0..3391cf2c6a 100644 --- a/libavdevice/alsa-audio-common.c +++ b/libavdevice/alsa-audio-common.c @@ -134,7 +134,8 @@ static av_cold ff_reorder_func find_reorder_func(int codec_id, 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_QUAD ? REORDER_DUMMY : + layout == AV_CH_LAYOUT_QUAD || layout == AV_CH_LAYOUT_2_2 ? + REORDER_DUMMY : layout == AV_CH_LAYOUT_5POINT0_BACK || layout == AV_CH_LAYOUT_5POINT0 ? out ? alsa_reorder_int16_out_50 : NULL : layout == AV_CH_LAYOUT_5POINT1_BACK || layout == AV_CH_LAYOUT_5POINT1 ? @@ -144,7 +145,8 @@ static av_cold ff_reorder_func find_reorder_func(int codec_id, 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_QUAD ? REORDER_DUMMY : + layout == AV_CH_LAYOUT_QUAD || layout == AV_CH_LAYOUT_2_2 ? + REORDER_DUMMY : layout == AV_CH_LAYOUT_5POINT0_BACK || layout == AV_CH_LAYOUT_5POINT0 ? out ? alsa_reorder_int32_out_50 : NULL : layout == AV_CH_LAYOUT_5POINT1_BACK || layout == AV_CH_LAYOUT_5POINT1 ? @@ -153,7 +155,8 @@ static av_cold ff_reorder_func find_reorder_func(int codec_id, out ? alsa_reorder_int32_out_71 : NULL : NULL : codec_id == CODEC_ID_PCM_F32LE || codec_id == CODEC_ID_PCM_F32BE ? - layout == AV_CH_LAYOUT_QUAD ? REORDER_DUMMY : + layout == AV_CH_LAYOUT_QUAD || layout == AV_CH_LAYOUT_2_2 ? + REORDER_DUMMY : layout == AV_CH_LAYOUT_5POINT0_BACK || layout == AV_CH_LAYOUT_5POINT0 ? out ? alsa_reorder_f32_out_50 : NULL : layout == AV_CH_LAYOUT_5POINT1_BACK || layout == AV_CH_LAYOUT_5POINT1 ? |