Unified · Split
| @@ -115,6 +115,9 @@ static void alsa_reorder_ ## NAME ## _out_71(const void *in_v, void *out_v, int · 114 unmodified lines | |||
| 115 | } \ | 115 | } \ |
| 116 | } | 116 | } |
| 117 | 117 | ||
| 118 | REORDER_OUT_50(int8, int8_t) | ||
| 119 | REORDER_OUT_51(int8, int8_t) | ||
| 120 | REORDER_OUT_71(int8, int8_t) | ||
| 118 | REORDER_OUT_50(int16, int16_t) | 121 | REORDER_OUT_50(int16, int16_t) |
| 119 | REORDER_OUT_51(int16, int16_t) | 122 | REORDER_OUT_51(int16, int16_t) |
| 120 | REORDER_OUT_71(int16, int16_t) | 123 | 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 | |||
| 132 | int out) | 135 | int out) |
| 133 | { | 136 | { |
| 134 | return | 137 | 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 : | ||
| 135 | codec_id == CODEC_ID_PCM_U16LE || codec_id == CODEC_ID_PCM_U16BE || | 149 | codec_id == CODEC_ID_PCM_U16LE || codec_id == CODEC_ID_PCM_U16BE || |
| 136 | codec_id == CODEC_ID_PCM_S16LE || codec_id == CODEC_ID_PCM_S16BE ? | 150 | codec_id == CODEC_ID_PCM_S16LE || codec_id == CODEC_ID_PCM_S16BE ? |
| 137 | layout == AV_CH_LAYOUT_QUAD || layout == AV_CH_LAYOUT_2_2 ? | 151 | layout == AV_CH_LAYOUT_QUAD || layout == AV_CH_LAYOUT_2_2 ? |