[FFmpeg-cvslog] Also support alsa channel reordering for u16 and u32 formats.

Carl Eugen Hoyos git at videolan.org
Thu Apr 14 05:10:33 CEST 2011


ffmpeg | branch: master | Carl Eugen Hoyos <cehoyos at ag.or.at> | Thu Apr 14 01:10:18 2011 +0200| [47c0c8ca9dba13618edce9da347f563ec1d9d811] | committer: Carl Eugen Hoyos

Also support alsa channel reordering for u16 and u32 formats.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=47c0c8ca9dba13618edce9da347f563ec1d9d811
---

 libavdevice/alsa-audio-common.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/libavdevice/alsa-audio-common.c b/libavdevice/alsa-audio-common.c
index 0222729..a6f3899 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 :



More information about the ffmpeg-cvslog mailing list