mirror of
https://gitlab.freedesktop.org/pipewire/pipewire.git
synced 2025-11-02 09:01:50 -05:00
spa: add 64 AUX channels
Make 64 AUX channels instead of using the CUSTOM range for them.
This commit is contained in:
Wim Taymans
parent
d03f29eb66
commit
1ad54e8a26
7 changed files with 211 additions and 86 deletions
|
|
@ -207,7 +207,75 @@ enum spa_audio_channel {
|
|||
SPA_AUDIO_CHANNEL_BLC, /**< bottom left center */
|
||||
SPA_AUDIO_CHANNEL_BRC, /**< bottom right center */
|
||||
|
||||
SPA_AUDIO_CHANNEL_CUSTOM_START = 0x10000,
|
||||
SPA_AUDIO_CHANNEL_START_Aux = 0x1000, /**< aux channels */
|
||||
SPA_AUDIO_CHANNEL_AUX0 = SPA_AUDIO_CHANNEL_START_Aux,
|
||||
SPA_AUDIO_CHANNEL_AUX1,
|
||||
SPA_AUDIO_CHANNEL_AUX2,
|
||||
SPA_AUDIO_CHANNEL_AUX3,
|
||||
SPA_AUDIO_CHANNEL_AUX4,
|
||||
SPA_AUDIO_CHANNEL_AUX5,
|
||||
SPA_AUDIO_CHANNEL_AUX6,
|
||||
SPA_AUDIO_CHANNEL_AUX7,
|
||||
SPA_AUDIO_CHANNEL_AUX8,
|
||||
SPA_AUDIO_CHANNEL_AUX9,
|
||||
SPA_AUDIO_CHANNEL_AUX10,
|
||||
SPA_AUDIO_CHANNEL_AUX11,
|
||||
SPA_AUDIO_CHANNEL_AUX12,
|
||||
SPA_AUDIO_CHANNEL_AUX13,
|
||||
SPA_AUDIO_CHANNEL_AUX14,
|
||||
SPA_AUDIO_CHANNEL_AUX15,
|
||||
SPA_AUDIO_CHANNEL_AUX16,
|
||||
SPA_AUDIO_CHANNEL_AUX17,
|
||||
SPA_AUDIO_CHANNEL_AUX18,
|
||||
SPA_AUDIO_CHANNEL_AUX19,
|
||||
SPA_AUDIO_CHANNEL_AUX20,
|
||||
SPA_AUDIO_CHANNEL_AUX21,
|
||||
SPA_AUDIO_CHANNEL_AUX22,
|
||||
SPA_AUDIO_CHANNEL_AUX23,
|
||||
SPA_AUDIO_CHANNEL_AUX24,
|
||||
SPA_AUDIO_CHANNEL_AUX25,
|
||||
SPA_AUDIO_CHANNEL_AUX26,
|
||||
SPA_AUDIO_CHANNEL_AUX27,
|
||||
SPA_AUDIO_CHANNEL_AUX28,
|
||||
SPA_AUDIO_CHANNEL_AUX29,
|
||||
SPA_AUDIO_CHANNEL_AUX30,
|
||||
SPA_AUDIO_CHANNEL_AUX31,
|
||||
SPA_AUDIO_CHANNEL_AUX32,
|
||||
SPA_AUDIO_CHANNEL_AUX33,
|
||||
SPA_AUDIO_CHANNEL_AUX34,
|
||||
SPA_AUDIO_CHANNEL_AUX35,
|
||||
SPA_AUDIO_CHANNEL_AUX36,
|
||||
SPA_AUDIO_CHANNEL_AUX37,
|
||||
SPA_AUDIO_CHANNEL_AUX38,
|
||||
SPA_AUDIO_CHANNEL_AUX39,
|
||||
SPA_AUDIO_CHANNEL_AUX40,
|
||||
SPA_AUDIO_CHANNEL_AUX41,
|
||||
SPA_AUDIO_CHANNEL_AUX42,
|
||||
SPA_AUDIO_CHANNEL_AUX43,
|
||||
SPA_AUDIO_CHANNEL_AUX44,
|
||||
SPA_AUDIO_CHANNEL_AUX45,
|
||||
SPA_AUDIO_CHANNEL_AUX46,
|
||||
SPA_AUDIO_CHANNEL_AUX47,
|
||||
SPA_AUDIO_CHANNEL_AUX48,
|
||||
SPA_AUDIO_CHANNEL_AUX49,
|
||||
SPA_AUDIO_CHANNEL_AUX50,
|
||||
SPA_AUDIO_CHANNEL_AUX51,
|
||||
SPA_AUDIO_CHANNEL_AUX52,
|
||||
SPA_AUDIO_CHANNEL_AUX53,
|
||||
SPA_AUDIO_CHANNEL_AUX54,
|
||||
SPA_AUDIO_CHANNEL_AUX55,
|
||||
SPA_AUDIO_CHANNEL_AUX56,
|
||||
SPA_AUDIO_CHANNEL_AUX57,
|
||||
SPA_AUDIO_CHANNEL_AUX58,
|
||||
SPA_AUDIO_CHANNEL_AUX59,
|
||||
SPA_AUDIO_CHANNEL_AUX60,
|
||||
SPA_AUDIO_CHANNEL_AUX61,
|
||||
SPA_AUDIO_CHANNEL_AUX62,
|
||||
SPA_AUDIO_CHANNEL_AUX63,
|
||||
|
||||
SPA_AUDIO_CHANNEL_LAST_Aux = 0x1fff, /**< aux channels */
|
||||
|
||||
SPA_AUDIO_CHANNEL_START_Custom = 0x10000,
|
||||
};
|
||||
|
||||
/** Extra audio flags */
|
||||
|
|
|
|||
|
|
@ -195,6 +195,71 @@ static const struct spa_type_info spa_type_audio_channel[] = {
|
|||
{ SPA_AUDIO_CHANNEL_BC, SPA_TYPE_Int, SPA_TYPE_INFO_AUDIO_CHANNEL_BASE "BC", NULL },
|
||||
{ SPA_AUDIO_CHANNEL_BLC, SPA_TYPE_Int, SPA_TYPE_INFO_AUDIO_CHANNEL_BASE "BLC", NULL },
|
||||
{ SPA_AUDIO_CHANNEL_BRC, SPA_TYPE_Int, SPA_TYPE_INFO_AUDIO_CHANNEL_BASE "BRC", NULL },
|
||||
|
||||
{ SPA_AUDIO_CHANNEL_AUX0, SPA_TYPE_Int, SPA_TYPE_INFO_AUDIO_CHANNEL_BASE "AUX0", NULL },
|
||||
{ SPA_AUDIO_CHANNEL_AUX1, SPA_TYPE_Int, SPA_TYPE_INFO_AUDIO_CHANNEL_BASE "AUX1", NULL },
|
||||
{ SPA_AUDIO_CHANNEL_AUX2, SPA_TYPE_Int, SPA_TYPE_INFO_AUDIO_CHANNEL_BASE "AUX2", NULL },
|
||||
{ SPA_AUDIO_CHANNEL_AUX3, SPA_TYPE_Int, SPA_TYPE_INFO_AUDIO_CHANNEL_BASE "AUX3", NULL },
|
||||
{ SPA_AUDIO_CHANNEL_AUX4, SPA_TYPE_Int, SPA_TYPE_INFO_AUDIO_CHANNEL_BASE "AUX4", NULL },
|
||||
{ SPA_AUDIO_CHANNEL_AUX5, SPA_TYPE_Int, SPA_TYPE_INFO_AUDIO_CHANNEL_BASE "AUX5", NULL },
|
||||
{ SPA_AUDIO_CHANNEL_AUX6, SPA_TYPE_Int, SPA_TYPE_INFO_AUDIO_CHANNEL_BASE "AUX6", NULL },
|
||||
{ SPA_AUDIO_CHANNEL_AUX7, SPA_TYPE_Int, SPA_TYPE_INFO_AUDIO_CHANNEL_BASE "AUX7", NULL },
|
||||
{ SPA_AUDIO_CHANNEL_AUX8, SPA_TYPE_Int, SPA_TYPE_INFO_AUDIO_CHANNEL_BASE "AUX8", NULL },
|
||||
{ SPA_AUDIO_CHANNEL_AUX9, SPA_TYPE_Int, SPA_TYPE_INFO_AUDIO_CHANNEL_BASE "AUX9", NULL },
|
||||
{ SPA_AUDIO_CHANNEL_AUX10, SPA_TYPE_Int, SPA_TYPE_INFO_AUDIO_CHANNEL_BASE "AUX10", NULL },
|
||||
{ SPA_AUDIO_CHANNEL_AUX11, SPA_TYPE_Int, SPA_TYPE_INFO_AUDIO_CHANNEL_BASE "AUX11", NULL },
|
||||
{ SPA_AUDIO_CHANNEL_AUX12, SPA_TYPE_Int, SPA_TYPE_INFO_AUDIO_CHANNEL_BASE "AUX12", NULL },
|
||||
{ SPA_AUDIO_CHANNEL_AUX13, SPA_TYPE_Int, SPA_TYPE_INFO_AUDIO_CHANNEL_BASE "AUX13", NULL },
|
||||
{ SPA_AUDIO_CHANNEL_AUX14, SPA_TYPE_Int, SPA_TYPE_INFO_AUDIO_CHANNEL_BASE "AUX14", NULL },
|
||||
{ SPA_AUDIO_CHANNEL_AUX15, SPA_TYPE_Int, SPA_TYPE_INFO_AUDIO_CHANNEL_BASE "AUX15", NULL },
|
||||
{ SPA_AUDIO_CHANNEL_AUX16, SPA_TYPE_Int, SPA_TYPE_INFO_AUDIO_CHANNEL_BASE "AUX16", NULL },
|
||||
{ SPA_AUDIO_CHANNEL_AUX17, SPA_TYPE_Int, SPA_TYPE_INFO_AUDIO_CHANNEL_BASE "AUX17", NULL },
|
||||
{ SPA_AUDIO_CHANNEL_AUX18, SPA_TYPE_Int, SPA_TYPE_INFO_AUDIO_CHANNEL_BASE "AUX18", NULL },
|
||||
{ SPA_AUDIO_CHANNEL_AUX19, SPA_TYPE_Int, SPA_TYPE_INFO_AUDIO_CHANNEL_BASE "AUX19", NULL },
|
||||
{ SPA_AUDIO_CHANNEL_AUX20, SPA_TYPE_Int, SPA_TYPE_INFO_AUDIO_CHANNEL_BASE "AUX20", NULL },
|
||||
{ SPA_AUDIO_CHANNEL_AUX21, SPA_TYPE_Int, SPA_TYPE_INFO_AUDIO_CHANNEL_BASE "AUX21", NULL },
|
||||
{ SPA_AUDIO_CHANNEL_AUX22, SPA_TYPE_Int, SPA_TYPE_INFO_AUDIO_CHANNEL_BASE "AUX22", NULL },
|
||||
{ SPA_AUDIO_CHANNEL_AUX23, SPA_TYPE_Int, SPA_TYPE_INFO_AUDIO_CHANNEL_BASE "AUX23", NULL },
|
||||
{ SPA_AUDIO_CHANNEL_AUX24, SPA_TYPE_Int, SPA_TYPE_INFO_AUDIO_CHANNEL_BASE "AUX24", NULL },
|
||||
{ SPA_AUDIO_CHANNEL_AUX25, SPA_TYPE_Int, SPA_TYPE_INFO_AUDIO_CHANNEL_BASE "AUX25", NULL },
|
||||
{ SPA_AUDIO_CHANNEL_AUX26, SPA_TYPE_Int, SPA_TYPE_INFO_AUDIO_CHANNEL_BASE "AUX26", NULL },
|
||||
{ SPA_AUDIO_CHANNEL_AUX27, SPA_TYPE_Int, SPA_TYPE_INFO_AUDIO_CHANNEL_BASE "AUX27", NULL },
|
||||
{ SPA_AUDIO_CHANNEL_AUX28, SPA_TYPE_Int, SPA_TYPE_INFO_AUDIO_CHANNEL_BASE "AUX28", NULL },
|
||||
{ SPA_AUDIO_CHANNEL_AUX29, SPA_TYPE_Int, SPA_TYPE_INFO_AUDIO_CHANNEL_BASE "AUX29", NULL },
|
||||
{ SPA_AUDIO_CHANNEL_AUX30, SPA_TYPE_Int, SPA_TYPE_INFO_AUDIO_CHANNEL_BASE "AUX30", NULL },
|
||||
{ SPA_AUDIO_CHANNEL_AUX31, SPA_TYPE_Int, SPA_TYPE_INFO_AUDIO_CHANNEL_BASE "AUX31", NULL },
|
||||
{ SPA_AUDIO_CHANNEL_AUX32, SPA_TYPE_Int, SPA_TYPE_INFO_AUDIO_CHANNEL_BASE "AUX32", NULL },
|
||||
{ SPA_AUDIO_CHANNEL_AUX33, SPA_TYPE_Int, SPA_TYPE_INFO_AUDIO_CHANNEL_BASE "AUX33", NULL },
|
||||
{ SPA_AUDIO_CHANNEL_AUX34, SPA_TYPE_Int, SPA_TYPE_INFO_AUDIO_CHANNEL_BASE "AUX34", NULL },
|
||||
{ SPA_AUDIO_CHANNEL_AUX35, SPA_TYPE_Int, SPA_TYPE_INFO_AUDIO_CHANNEL_BASE "AUX35", NULL },
|
||||
{ SPA_AUDIO_CHANNEL_AUX36, SPA_TYPE_Int, SPA_TYPE_INFO_AUDIO_CHANNEL_BASE "AUX36", NULL },
|
||||
{ SPA_AUDIO_CHANNEL_AUX37, SPA_TYPE_Int, SPA_TYPE_INFO_AUDIO_CHANNEL_BASE "AUX37", NULL },
|
||||
{ SPA_AUDIO_CHANNEL_AUX38, SPA_TYPE_Int, SPA_TYPE_INFO_AUDIO_CHANNEL_BASE "AUX38", NULL },
|
||||
{ SPA_AUDIO_CHANNEL_AUX39, SPA_TYPE_Int, SPA_TYPE_INFO_AUDIO_CHANNEL_BASE "AUX39", NULL },
|
||||
{ SPA_AUDIO_CHANNEL_AUX40, SPA_TYPE_Int, SPA_TYPE_INFO_AUDIO_CHANNEL_BASE "AUX40", NULL },
|
||||
{ SPA_AUDIO_CHANNEL_AUX41, SPA_TYPE_Int, SPA_TYPE_INFO_AUDIO_CHANNEL_BASE "AUX41", NULL },
|
||||
{ SPA_AUDIO_CHANNEL_AUX42, SPA_TYPE_Int, SPA_TYPE_INFO_AUDIO_CHANNEL_BASE "AUX42", NULL },
|
||||
{ SPA_AUDIO_CHANNEL_AUX43, SPA_TYPE_Int, SPA_TYPE_INFO_AUDIO_CHANNEL_BASE "AUX43", NULL },
|
||||
{ SPA_AUDIO_CHANNEL_AUX44, SPA_TYPE_Int, SPA_TYPE_INFO_AUDIO_CHANNEL_BASE "AUX44", NULL },
|
||||
{ SPA_AUDIO_CHANNEL_AUX45, SPA_TYPE_Int, SPA_TYPE_INFO_AUDIO_CHANNEL_BASE "AUX45", NULL },
|
||||
{ SPA_AUDIO_CHANNEL_AUX46, SPA_TYPE_Int, SPA_TYPE_INFO_AUDIO_CHANNEL_BASE "AUX46", NULL },
|
||||
{ SPA_AUDIO_CHANNEL_AUX47, SPA_TYPE_Int, SPA_TYPE_INFO_AUDIO_CHANNEL_BASE "AUX47", NULL },
|
||||
{ SPA_AUDIO_CHANNEL_AUX48, SPA_TYPE_Int, SPA_TYPE_INFO_AUDIO_CHANNEL_BASE "AUX48", NULL },
|
||||
{ SPA_AUDIO_CHANNEL_AUX49, SPA_TYPE_Int, SPA_TYPE_INFO_AUDIO_CHANNEL_BASE "AUX49", NULL },
|
||||
{ SPA_AUDIO_CHANNEL_AUX50, SPA_TYPE_Int, SPA_TYPE_INFO_AUDIO_CHANNEL_BASE "AUX50", NULL },
|
||||
{ SPA_AUDIO_CHANNEL_AUX51, SPA_TYPE_Int, SPA_TYPE_INFO_AUDIO_CHANNEL_BASE "AUX51", NULL },
|
||||
{ SPA_AUDIO_CHANNEL_AUX52, SPA_TYPE_Int, SPA_TYPE_INFO_AUDIO_CHANNEL_BASE "AUX52", NULL },
|
||||
{ SPA_AUDIO_CHANNEL_AUX53, SPA_TYPE_Int, SPA_TYPE_INFO_AUDIO_CHANNEL_BASE "AUX53", NULL },
|
||||
{ SPA_AUDIO_CHANNEL_AUX54, SPA_TYPE_Int, SPA_TYPE_INFO_AUDIO_CHANNEL_BASE "AUX54", NULL },
|
||||
{ SPA_AUDIO_CHANNEL_AUX55, SPA_TYPE_Int, SPA_TYPE_INFO_AUDIO_CHANNEL_BASE "AUX55", NULL },
|
||||
{ SPA_AUDIO_CHANNEL_AUX56, SPA_TYPE_Int, SPA_TYPE_INFO_AUDIO_CHANNEL_BASE "AUX56", NULL },
|
||||
{ SPA_AUDIO_CHANNEL_AUX57, SPA_TYPE_Int, SPA_TYPE_INFO_AUDIO_CHANNEL_BASE "AUX57", NULL },
|
||||
{ SPA_AUDIO_CHANNEL_AUX58, SPA_TYPE_Int, SPA_TYPE_INFO_AUDIO_CHANNEL_BASE "AUX58", NULL },
|
||||
{ SPA_AUDIO_CHANNEL_AUX59, SPA_TYPE_Int, SPA_TYPE_INFO_AUDIO_CHANNEL_BASE "AUX59", NULL },
|
||||
{ SPA_AUDIO_CHANNEL_AUX60, SPA_TYPE_Int, SPA_TYPE_INFO_AUDIO_CHANNEL_BASE "AUX60", NULL },
|
||||
{ SPA_AUDIO_CHANNEL_AUX61, SPA_TYPE_Int, SPA_TYPE_INFO_AUDIO_CHANNEL_BASE "AUX61", NULL },
|
||||
{ SPA_AUDIO_CHANNEL_AUX62, SPA_TYPE_Int, SPA_TYPE_INFO_AUDIO_CHANNEL_BASE "AUX62", NULL },
|
||||
{ SPA_AUDIO_CHANNEL_AUX63, SPA_TYPE_Int, SPA_TYPE_INFO_AUDIO_CHANNEL_BASE "AUX63", NULL },
|
||||
{ 0, 0, NULL, NULL },
|
||||
};
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue