History

Support u8, s8, alaw and mulaw channel reordering in alsa.

Anton Khirnov committed 15 years ago

Commit ffc6c8a1 parent 4b87a081 file · +14 −0Browse files

Unified · Split

libavdevice/alsa-audio-common.c+14−0
@@ -115,6 +115,9 @@ static void alsa_reorder_ ## NAME ## _out_71(const void *in_v, void *out_v, int · 114 unmodified lines
115115 } \
116116 }
117117
118+REORDER_OUT_50(int8, int8_t)
119+REORDER_OUT_51(int8, int8_t)
120+REORDER_OUT_71(int8, int8_t)
118121 REORDER_OUT_50(int16, int16_t)
119122 REORDER_OUT_51(int16, int16_t)
120123 REORDER_OUT_71(int16, int16_t)
@@ -132,6 +135,17 @@ static av_cold ff_reorder_func find_reorder_func(int codec_id, · 11 unmodified lines
132135 int out)
133136 {
134137 return
138+ codec_id == CODEC_ID_PCM_U8 || codec_id == CODEC_ID_PCM_S8 ||
139+ codec_id == CODEC_ID_PCM_ALAW || codec_id == CODEC_ID_PCM_MULAW ?
140+ layout == AV_CH_LAYOUT_QUAD || layout == AV_CH_LAYOUT_2_2 ?
141+ REORDER_DUMMY :
142+ layout == AV_CH_LAYOUT_5POINT0_BACK || layout == AV_CH_LAYOUT_5POINT0 ?
143+ out ? alsa_reorder_int8_out_50 : NULL :
144+ layout == AV_CH_LAYOUT_5POINT1_BACK || layout == AV_CH_LAYOUT_5POINT1 ?
145+ out ? alsa_reorder_int8_out_51 : NULL :
146+ layout == AV_CH_LAYOUT_7POINT1 ?
147+ out ? alsa_reorder_int8_out_71 : NULL :
148+ NULL :
135149 codec_id == CODEC_ID_PCM_U16LE || codec_id == CODEC_ID_PCM_U16BE ||
136150 codec_id == CODEC_ID_PCM_S16LE || codec_id == CODEC_ID_PCM_S16BE ?
137151 layout == AV_CH_LAYOUT_QUAD || layout == AV_CH_LAYOUT_2_2 ?

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t