laiyp/lib_xua
1
0
Fork 0
forked from PAWPAW-Mirror/lib_xua
Code Pull Requests Activity

Merge pull request #341 from xross/develop

Browse Source
This commit is contained in:
Ross Owen
2023-08-21 15:53:51 +01:00
committed by GitHub
parent dff72573f8 b49bd69abe
commit a796e1ee36
2 changed files with 34 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
CHANGELOG.rst
View File

@@ -1,6 +1,12 @@
lib_xua Change Log lib_xua Change Log
================== ==================
HEAD
----
* RESOLVED: Output volume control not enabled by default when MIXER disabled
* RESOLVED: Full 32bit result of volume processing not calculated when required
3.5.1 3.5.1
----- -----

52
lib_xua/api/xua_conf_default.h
View File

@@ -1133,9 +1133,13 @@
#define VOLUME_RES_MIXER (0x100) #define VOLUME_RES_MIXER (0x100)
#endif #endif
/* Handle out volume control in the mixer - enabled by default */ /* Handle out volume control in the mixer - enabled by default if mixer enabled */
#ifndef OUT_VOLUME_IN_MIXER #ifndef OUT_VOLUME_IN_MIXER
#define OUT_VOLUME_IN_MIXER (1) #if MIXER
#define OUT_VOLUME_IN_MIXER (1)
#else
#define OUT_VOLUME_IN_MIXER (0)
#endif
#endif #endif
/* Apply out volume controls after the mix. Only relevant when OUT_VOLUME_IN_MIXER enabled. Enabled by default */ /* Apply out volume controls after the mix. Only relevant when OUT_VOLUME_IN_MIXER enabled. Enabled by default */
@@ -1148,7 +1152,7 @@
#define IN_VOLUME_IN_MIXER (0) #define IN_VOLUME_IN_MIXER (0)
#endif #endif
/* Apply in volume controls after the mix. Only relebant when IN_VOLUMNE_IN MIXER enabled. Enabled by default */ /* Apply in volume controls after the mix. Only relevant when IN_VOLUMNE_IN MIXER enabled. Enabled by default */
#ifndef IN_VOLUME_AFTER_MIX #ifndef IN_VOLUME_AFTER_MIX
#define IN_VOLUME_AFTER_MIX (1) #define IN_VOLUME_AFTER_MIX (1)
#endif #endif
@@ -1349,7 +1353,7 @@ enum USBEndpointNumber_Out
/* Some defines that allow us to remove unused code */ /* Some defines that allow us to remove unused code */
/* Useful for dropping lower part of macs in volume processing... */ /* Useful for dropping lower part of macs in volume processing... */
#if (FS_STREAM_FORMAT_OUTPUT_1_RESOLUTION_BITS > 24) || (HS_STREAM_FORMAT_OUTPUT_2_RESOLUTION_BITS > 24) || \ #if (FS_STREAM_FORMAT_OUTPUT_1_RESOLUTION_BITS > 24) || (HS_STREAM_FORMAT_OUTPUT_1_RESOLUTION_BITS > 24) || \
(((FS_STREAM_FORMAT_OUTPUT_2_RESOLUTION_BITS > 24) || (HS_STREAM_FORMAT_OUTPUT_2_RESOLUTION_BITS > 24)) && (OUTPUT_FORMAT_COUNT > 1)) || \ (((FS_STREAM_FORMAT_OUTPUT_2_RESOLUTION_BITS > 24) || (HS_STREAM_FORMAT_OUTPUT_2_RESOLUTION_BITS > 24)) && (OUTPUT_FORMAT_COUNT > 1)) || \
(((FS_STREAM_FORMAT_OUTPUT_3_RESOLUTION_BITS > 24) || (HS_STREAM_FORMAT_OUTPUT_3_RESOLUTION_BITS > 24)) && (OUTPUT_FORMAT_COUNT > 2)) (((FS_STREAM_FORMAT_OUTPUT_3_RESOLUTION_BITS > 24) || (HS_STREAM_FORMAT_OUTPUT_3_RESOLUTION_BITS > 24)) && (OUTPUT_FORMAT_COUNT > 2))
#define STREAM_FORMAT_OUTPUT_RESOLUTION_32BIT_USED 1 #define STREAM_FORMAT_OUTPUT_RESOLUTION_32BIT_USED 1
@@ -1383,29 +1387,29 @@ enum USBEndpointNumber_Out
#endif #endif
/* Useful for dropping lower part of macs in volume processing... */ /* Useful for dropping lower part of macs in volume processing... */
#if (FS_STREAM_FORMAT_INPUT_1_RESOLUTION_BITS > 24) || (FS_STREAM_FORMAT_INPUT_2_RESOLUTION_BITS > 24) #if (FS_STREAM_FORMAT_INPUT_1_RESOLUTION_BITS > 24) || (HS_STREAM_FORMAT_INPUT_1_RESOLUTION_BITS > 24)
#define STREAM_FORMAT_INPUT_RESOLUTION_32BIT_USED 1 #define STREAM_FORMAT_INPUT_RESOLUTION_32BIT_USED 1
#else #else
#define STREAM_FORMAT_INPUT_RESOLUTION_32BIT_USED 0 #define STREAM_FORMAT_INPUT_RESOLUTION_32BIT_USED 0
#endif #endif
#if((FS_STREAM_FORMAT_INPUT_1_SUBSLOT_BYTES == 4) || (HS_STREAM_FORMAT_INPUT_1_SUBSLOT_BYTES == 4)) #if((FS_STREAM_FORMAT_INPUT_1_SUBSLOT_BYTES == 4) || (HS_STREAM_FORMAT_INPUT_1_SUBSLOT_BYTES == 4))
#define STREAM_FORMAT_INPUT_SUBSLOT_4_USED 1 #define STREAM_FORMAT_INPUT_SUBSLOT_4_USED 1
#else #else
#define STREAM_FORMAT_INPUT_SUBSLOT_4_USED 0 #define STREAM_FORMAT_INPUT_SUBSLOT_4_USED 0
#endif #endif
#if((FS_STREAM_FORMAT_INPUT_1_SUBSLOT_BYTES == 3) || (HS_STREAM_FORMAT_INPUT_1_SUBSLOT_BYTES == 3)) #if((FS_STREAM_FORMAT_INPUT_1_SUBSLOT_BYTES == 3) || (HS_STREAM_FORMAT_INPUT_1_SUBSLOT_BYTES == 3))
#define STREAM_FORMAT_INPUT_SUBSLOT_3_USED 1 #define STREAM_FORMAT_INPUT_SUBSLOT_3_USED 1
#else #else
#define STREAM_FORMAT_INPUT_SUBSLOT_3_USED 0 #define STREAM_FORMAT_INPUT_SUBSLOT_3_USED 0
#endif #endif
#if((FS_STREAM_FORMAT_INPUT_1_SUBSLOT_BYTES == 2) || (HS_STREAM_FORMAT_INPUT_1_SUBSLOT_BYTES == 2)) #if((FS_STREAM_FORMAT_INPUT_1_SUBSLOT_BYTES == 2) || (HS_STREAM_FORMAT_INPUT_1_SUBSLOT_BYTES == 2))
#define STREAM_FORMAT_INPUT_SUBSLOT_2_USED 1 #define STREAM_FORMAT_INPUT_SUBSLOT_2_USED 1
#else #else
#define STREAM_FORMAT_INPUT_SUBSLOT_2_USED 0 #define STREAM_FORMAT_INPUT_SUBSLOT_2_USED 0
#endif #endif
#if MAX_FREQ < MIN_FREQ #if MAX_FREQ < MIN_FREQ
#error MAX_FREQ should be >= MIN_FREQ!! #error MAX_FREQ should be >= MIN_FREQ!!