Replace AUDIO_CONFIGURATION constants with MAKE_AUDIO_CONFIGURATION() macro

This commit is contained in:
Cameron Gutman committed 2020-03-31 21:33:34 -07:00
1 parent fb60ae6a4d
commit 607aaca93f
5 files changed
+33 -22

No files matched your search

+2 -14
View File
@@ -5,12 +5,6 @@
#define MAX_SDP_HEADER_LEN 128
#define MAX_SDP_TAIL_LEN 128
#define CHANNEL_COUNT_STEREO 2
#define CHANNEL_COUNT_51_SURROUND 6
#define CHANNEL_MASK_STEREO 0x3
#define CHANNEL_MASK_51_SURROUND 0xFC
typedef struct _SDP_OPTION {
char name[MAX_OPTION_NAME_LEN + 1];
void* payload;
@@ -266,14 +260,8 @@ static PSDP_OPTION getAttributesList(char*urlSafeAddr) {
err |= addGen5Options(&optionHead);
}
if (StreamConfig.audioConfiguration == AUDIO_CONFIGURATION_51_SURROUND) {
audioChannelCount = CHANNEL_COUNT_51_SURROUND;
audioChannelMask = CHANNEL_MASK_51_SURROUND;
}
else {
audioChannelCount = CHANNEL_COUNT_STEREO;
audioChannelMask = CHANNEL_MASK_STEREO;
}
audioChannelCount = CHANNEL_COUNT_FROM_AUDIO_CONFIGURATION(StreamConfig.audioConfiguration);
audioChannelMask = CHANNEL_MASK_FROM_AUDIO_CONFIGURATION(StreamConfig.audioConfiguration);
if (AppVersionQuad[0] >= 4) {
unsigned char slicesPerFrame;