mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-11-05 13:30:02 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

acp: sync versions

Browse source
This commit is contained in:
Wim Taymans 2020-11-26 10:42:26 +01:00
parent d77c563ae8
commit 4d62899375
2 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
spa/plugins/alsa/acp/acp.c
View file

@ -94,9 +94,11 @@ static const uint32_t channel_table[PA_CHANNEL_POSITION_MAX] = {
[PA_CHANNEL_POSITION_TOP_REAR_CENTER] = ACP_CHANNEL_TRC, [PA_CHANNEL_POSITION_TOP_REAR_CENTER] = ACP_CHANNEL_TRC,
}; };
#define ACP_N_ELEMENTS(arr) (sizeof(arr) / sizeof((arr)[0]))
static inline uint32_t channel_pa2acp(pa_channel_position_t channel) static inline uint32_t channel_pa2acp(pa_channel_position_t channel)
{ {
if (channel < 0 || (size_t)channel >= SPA_N_ELEMENTS(channel_table)) if (channel < 0 || (size_t)channel >= ACP_N_ELEMENTS(channel_table))
return ACP_CHANNEL_UNKNOWN; return ACP_CHANNEL_UNKNOWN;
return channel_table[channel]; return channel_table[channel];
} }

10
spa/plugins/alsa/acp/channelmap.h
View file

@ -25,8 +25,6 @@
extern "C" { extern "C" {
#endif #endif
#include <spa/utils/defs.h>
#define PA_CHANNELS_MAX 64 #define PA_CHANNELS_MAX 64
#define PA_CHANNEL_MAP_SNPRINT_MAX 336 #define PA_CHANNEL_MAP_SNPRINT_MAX 336
@ -163,17 +161,17 @@ static inline pa_channel_map* pa_channel_map_init_auto(pa_channel_map *m, unsign
case 8: case 8:
m->map[6] = PA_CHANNEL_POSITION_SIDE_LEFT; m->map[6] = PA_CHANNEL_POSITION_SIDE_LEFT;
m->map[7] = PA_CHANNEL_POSITION_SIDE_RIGHT; m->map[7] = PA_CHANNEL_POSITION_SIDE_RIGHT;
SPA_FALLTHROUGH /* Fall through */
case 6: case 6:
m->map[5] = PA_CHANNEL_POSITION_LFE; m->map[5] = PA_CHANNEL_POSITION_LFE;
SPA_FALLTHROUGH /* Fall through */
case 5: case 5:
m->map[4] = PA_CHANNEL_POSITION_FRONT_CENTER; m->map[4] = PA_CHANNEL_POSITION_FRONT_CENTER;
SPA_FALLTHROUGH /* Fall through */
case 4: case 4:
m->map[2] = PA_CHANNEL_POSITION_REAR_LEFT; m->map[2] = PA_CHANNEL_POSITION_REAR_LEFT;
m->map[3] = PA_CHANNEL_POSITION_REAR_RIGHT; m->map[3] = PA_CHANNEL_POSITION_REAR_RIGHT;
SPA_FALLTHROUGH /* Fall through */
case 2: case 2:
m->map[0] = PA_CHANNEL_POSITION_FRONT_LEFT; m->map[0] = PA_CHANNEL_POSITION_FRONT_LEFT;
m->map[1] = PA_CHANNEL_POSITION_FRONT_RIGHT; m->map[1] = PA_CHANNEL_POSITION_FRONT_RIGHT;