Skip to content

F
ffmpeg.wasm-core
Commit b8a44442 authored by Carl Eugen Hoyos's avatar Carl Eugen Hoyos
Browse files
Options

AV_CH_LAYOUT_2_2 does not need channel reordering for alsa output.

parent 6daf513c
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 3 deletions
libavdevice/alsa-audio-common.c
View file @ b8a44442
......@@ -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 ?
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment