diff --git a/lib_ex3d/.DS_Store b/lib_ex3d/.DS_Store new file mode 100644 index 0000000..b706780 Binary files /dev/null and b/lib_ex3d/.DS_Store differ diff --git a/lib_ex3d/Makefile b/lib_ex3d/Makefile new file mode 100644 index 0000000..8b74c9a --- /dev/null +++ b/lib_ex3d/Makefile @@ -0,0 +1,10 @@ +# This variable should contain a space separated list of all +# the directories containing buildable applications (usually +# prefixed with the app_ prefix) +# +# If the variable is set to "all" then all directories that start with app_ +# are built. +BUILD_SUBDIRS = all + +XMOS_MAKE_PATH ?= .. +include $(XMOS_MAKE_PATH)/xcommon/module_xcommon/build/Makefile.toplevel diff --git a/lib_ex3d/lib_ex3d/.DS_Store b/lib_ex3d/lib_ex3d/.DS_Store index a479b9e..7081781 100644 Binary files a/lib_ex3d/lib_ex3d/.DS_Store and b/lib_ex3d/lib_ex3d/.DS_Store differ diff --git a/lib_ex3d/lib_ex3d/api/DSBuild.h b/lib_ex3d/lib_ex3d/api/DSBuild.h index c331c1d..ffd34f2 100644 --- a/lib_ex3d/lib_ex3d/api/DSBuild.h +++ b/lib_ex3d/lib_ex3d/api/DSBuild.h @@ -33,12 +33,12 @@ #endif #if NUM_USB_CHAN_OUT == 8 - -// 6ch version -#define DSP_WORKER_COUNT 2//4//3 //the count of workers -#define DSP_WORKER_DATA_CH_COUNT 3//2 //3 //the number of channels each one handles +//#define SHOOTING_GAME +#define DSP_WORKER_COUNT 4//3 //the count of workers +#define DSP_WORKER_DATA_CH_COUNT 2 //3 //the number of channels each one handles #define DSP_WORKER_FILTER_PER_DATA_CH 2 //the number of channels each one handles - +// #define IR_AUDIO +// #define IR_VIDEO #else #define IR_PS5 #define DSP_WORKER_COUNT 4 //the count of workers diff --git a/lib_ex3d/lib_ex3d/api/IR.h b/lib_ex3d/lib_ex3d/api/IR.h index b43118a..ef9c0a1 100644 --- a/lib_ex3d/lib_ex3d/api/IR.h +++ b/lib_ex3d/lib_ex3d/api/IR.h @@ -2,640 +2,640 @@ EXTERN td_block_fir_filter_t td_block_fir_filter_SPATIAL_71_DRAMA_lfe_left; //This is the count of int32_t words to allocate for one data channel. //i.e. int32_t channel_data[SPATIAL_71_DRAMA_lfe_left_DATA_BUFFER_ELEMENTS] = { 0 }; -#define SPATIAL_71_DRAMA_lfe_left_DATA_BUFFER_ELEMENTS (1224) +#define SPATIAL_71_DRAMA_lfe_left_DATA_BUFFER_ELEMENTS (2520) #define SPATIAL_71_DRAMA_lfe_left_TD_BLOCK_LENGTH (8) -#define SPATIAL_71_DRAMA_lfe_left_BLOCK_COUNT (151) +#define SPATIAL_71_DRAMA_lfe_left_BLOCK_COUNT (313) #define SPATIAL_71_DRAMA_lfe_left_FRAME_ADVANCE (8) #define SPATIAL_71_DRAMA_lfe_left_FRAME_OVERLAP (0) EXTERN td_block_fir_filter_t td_block_fir_filter_SPATIAL_71_DRAMA_lfe_right; //This is the count of int32_t words to allocate for one data channel. //i.e. int32_t channel_data[SPATIAL_71_DRAMA_lfe_right_DATA_BUFFER_ELEMENTS] = { 0 }; -#define SPATIAL_71_DRAMA_lfe_right_DATA_BUFFER_ELEMENTS (1224) +#define SPATIAL_71_DRAMA_lfe_right_DATA_BUFFER_ELEMENTS (2520) #define SPATIAL_71_DRAMA_lfe_right_TD_BLOCK_LENGTH (8) -#define SPATIAL_71_DRAMA_lfe_right_BLOCK_COUNT (151) +#define SPATIAL_71_DRAMA_lfe_right_BLOCK_COUNT (313) #define SPATIAL_71_DRAMA_lfe_right_FRAME_ADVANCE (8) #define SPATIAL_71_DRAMA_lfe_right_FRAME_OVERLAP (0) EXTERN td_block_fir_filter_t td_block_fir_filter_SPATIAL_71_DRAMA_v090h000_left; //This is the count of int32_t words to allocate for one data channel. //i.e. int32_t channel_data[SPATIAL_71_DRAMA_v090h000_left_DATA_BUFFER_ELEMENTS] = { 0 }; -#define SPATIAL_71_DRAMA_v090h000_left_DATA_BUFFER_ELEMENTS (1224) +#define SPATIAL_71_DRAMA_v090h000_left_DATA_BUFFER_ELEMENTS (2520) #define SPATIAL_71_DRAMA_v090h000_left_TD_BLOCK_LENGTH (8) -#define SPATIAL_71_DRAMA_v090h000_left_BLOCK_COUNT (151) +#define SPATIAL_71_DRAMA_v090h000_left_BLOCK_COUNT (313) #define SPATIAL_71_DRAMA_v090h000_left_FRAME_ADVANCE (8) #define SPATIAL_71_DRAMA_v090h000_left_FRAME_OVERLAP (0) EXTERN td_block_fir_filter_t td_block_fir_filter_SPATIAL_71_DRAMA_v090h000_right; //This is the count of int32_t words to allocate for one data channel. //i.e. int32_t channel_data[SPATIAL_71_DRAMA_v090h000_right_DATA_BUFFER_ELEMENTS] = { 0 }; -#define SPATIAL_71_DRAMA_v090h000_right_DATA_BUFFER_ELEMENTS (1224) +#define SPATIAL_71_DRAMA_v090h000_right_DATA_BUFFER_ELEMENTS (2520) #define SPATIAL_71_DRAMA_v090h000_right_TD_BLOCK_LENGTH (8) -#define SPATIAL_71_DRAMA_v090h000_right_BLOCK_COUNT (151) +#define SPATIAL_71_DRAMA_v090h000_right_BLOCK_COUNT (313) #define SPATIAL_71_DRAMA_v090h000_right_FRAME_ADVANCE (8) #define SPATIAL_71_DRAMA_v090h000_right_FRAME_OVERLAP (0) EXTERN td_block_fir_filter_t td_block_fir_filter_SPATIAL_71_DRAMA_v090h045_left; //This is the count of int32_t words to allocate for one data channel. //i.e. int32_t channel_data[SPATIAL_71_DRAMA_v090h045_left_DATA_BUFFER_ELEMENTS] = { 0 }; -#define SPATIAL_71_DRAMA_v090h045_left_DATA_BUFFER_ELEMENTS (1224) +#define SPATIAL_71_DRAMA_v090h045_left_DATA_BUFFER_ELEMENTS (2520) #define SPATIAL_71_DRAMA_v090h045_left_TD_BLOCK_LENGTH (8) -#define SPATIAL_71_DRAMA_v090h045_left_BLOCK_COUNT (151) +#define SPATIAL_71_DRAMA_v090h045_left_BLOCK_COUNT (313) #define SPATIAL_71_DRAMA_v090h045_left_FRAME_ADVANCE (8) #define SPATIAL_71_DRAMA_v090h045_left_FRAME_OVERLAP (0) EXTERN td_block_fir_filter_t td_block_fir_filter_SPATIAL_71_DRAMA_v090h045_right; //This is the count of int32_t words to allocate for one data channel. //i.e. int32_t channel_data[SPATIAL_71_DRAMA_v090h045_right_DATA_BUFFER_ELEMENTS] = { 0 }; -#define SPATIAL_71_DRAMA_v090h045_right_DATA_BUFFER_ELEMENTS (1224) +#define SPATIAL_71_DRAMA_v090h045_right_DATA_BUFFER_ELEMENTS (2520) #define SPATIAL_71_DRAMA_v090h045_right_TD_BLOCK_LENGTH (8) -#define SPATIAL_71_DRAMA_v090h045_right_BLOCK_COUNT (151) +#define SPATIAL_71_DRAMA_v090h045_right_BLOCK_COUNT (313) #define SPATIAL_71_DRAMA_v090h045_right_FRAME_ADVANCE (8) #define SPATIAL_71_DRAMA_v090h045_right_FRAME_OVERLAP (0) EXTERN td_block_fir_filter_t td_block_fir_filter_SPATIAL_71_DRAMA_v090h090_left; //This is the count of int32_t words to allocate for one data channel. //i.e. int32_t channel_data[SPATIAL_71_DRAMA_v090h090_left_DATA_BUFFER_ELEMENTS] = { 0 }; -#define SPATIAL_71_DRAMA_v090h090_left_DATA_BUFFER_ELEMENTS (1872) +#define SPATIAL_71_DRAMA_v090h090_left_DATA_BUFFER_ELEMENTS (2520) #define SPATIAL_71_DRAMA_v090h090_left_TD_BLOCK_LENGTH (8) -#define SPATIAL_71_DRAMA_v090h090_left_BLOCK_COUNT (232) +#define SPATIAL_71_DRAMA_v090h090_left_BLOCK_COUNT (313) #define SPATIAL_71_DRAMA_v090h090_left_FRAME_ADVANCE (8) #define SPATIAL_71_DRAMA_v090h090_left_FRAME_OVERLAP (0) EXTERN td_block_fir_filter_t td_block_fir_filter_SPATIAL_71_DRAMA_v090h090_right; //This is the count of int32_t words to allocate for one data channel. //i.e. int32_t channel_data[SPATIAL_71_DRAMA_v090h090_right_DATA_BUFFER_ELEMENTS] = { 0 }; -#define SPATIAL_71_DRAMA_v090h090_right_DATA_BUFFER_ELEMENTS (1872) +#define SPATIAL_71_DRAMA_v090h090_right_DATA_BUFFER_ELEMENTS (2520) #define SPATIAL_71_DRAMA_v090h090_right_TD_BLOCK_LENGTH (8) -#define SPATIAL_71_DRAMA_v090h090_right_BLOCK_COUNT (232) +#define SPATIAL_71_DRAMA_v090h090_right_BLOCK_COUNT (313) #define SPATIAL_71_DRAMA_v090h090_right_FRAME_ADVANCE (8) #define SPATIAL_71_DRAMA_v090h090_right_FRAME_OVERLAP (0) EXTERN td_block_fir_filter_t td_block_fir_filter_SPATIAL_71_DRAMA_v090h135_left; //This is the count of int32_t words to allocate for one data channel. //i.e. int32_t channel_data[SPATIAL_71_DRAMA_v090h135_left_DATA_BUFFER_ELEMENTS] = { 0 }; -#define SPATIAL_71_DRAMA_v090h135_left_DATA_BUFFER_ELEMENTS (1824) +#define SPATIAL_71_DRAMA_v090h135_left_DATA_BUFFER_ELEMENTS (2520) #define SPATIAL_71_DRAMA_v090h135_left_TD_BLOCK_LENGTH (8) -#define SPATIAL_71_DRAMA_v090h135_left_BLOCK_COUNT (226) +#define SPATIAL_71_DRAMA_v090h135_left_BLOCK_COUNT (313) #define SPATIAL_71_DRAMA_v090h135_left_FRAME_ADVANCE (8) #define SPATIAL_71_DRAMA_v090h135_left_FRAME_OVERLAP (0) EXTERN td_block_fir_filter_t td_block_fir_filter_SPATIAL_71_DRAMA_v090h135_right; //This is the count of int32_t words to allocate for one data channel. //i.e. int32_t channel_data[SPATIAL_71_DRAMA_v090h135_right_DATA_BUFFER_ELEMENTS] = { 0 }; -#define SPATIAL_71_DRAMA_v090h135_right_DATA_BUFFER_ELEMENTS (1824) +#define SPATIAL_71_DRAMA_v090h135_right_DATA_BUFFER_ELEMENTS (2520) #define SPATIAL_71_DRAMA_v090h135_right_TD_BLOCK_LENGTH (8) -#define SPATIAL_71_DRAMA_v090h135_right_BLOCK_COUNT (226) +#define SPATIAL_71_DRAMA_v090h135_right_BLOCK_COUNT (313) #define SPATIAL_71_DRAMA_v090h135_right_FRAME_ADVANCE (8) #define SPATIAL_71_DRAMA_v090h135_right_FRAME_OVERLAP (0) EXTERN td_block_fir_filter_t td_block_fir_filter_SPATIAL_71_DRAMA_v090h225_left; //This is the count of int32_t words to allocate for one data channel. //i.e. int32_t channel_data[SPATIAL_71_DRAMA_v090h225_left_DATA_BUFFER_ELEMENTS] = { 0 }; -#define SPATIAL_71_DRAMA_v090h225_left_DATA_BUFFER_ELEMENTS (1824) +#define SPATIAL_71_DRAMA_v090h225_left_DATA_BUFFER_ELEMENTS (2520) #define SPATIAL_71_DRAMA_v090h225_left_TD_BLOCK_LENGTH (8) -#define SPATIAL_71_DRAMA_v090h225_left_BLOCK_COUNT (226) +#define SPATIAL_71_DRAMA_v090h225_left_BLOCK_COUNT (313) #define SPATIAL_71_DRAMA_v090h225_left_FRAME_ADVANCE (8) #define SPATIAL_71_DRAMA_v090h225_left_FRAME_OVERLAP (0) EXTERN td_block_fir_filter_t td_block_fir_filter_SPATIAL_71_DRAMA_v090h225_right; //This is the count of int32_t words to allocate for one data channel. //i.e. int32_t channel_data[SPATIAL_71_DRAMA_v090h225_right_DATA_BUFFER_ELEMENTS] = { 0 }; -#define SPATIAL_71_DRAMA_v090h225_right_DATA_BUFFER_ELEMENTS (1824) +#define SPATIAL_71_DRAMA_v090h225_right_DATA_BUFFER_ELEMENTS (2520) #define SPATIAL_71_DRAMA_v090h225_right_TD_BLOCK_LENGTH (8) -#define SPATIAL_71_DRAMA_v090h225_right_BLOCK_COUNT (226) +#define SPATIAL_71_DRAMA_v090h225_right_BLOCK_COUNT (313) #define SPATIAL_71_DRAMA_v090h225_right_FRAME_ADVANCE (8) #define SPATIAL_71_DRAMA_v090h225_right_FRAME_OVERLAP (0) EXTERN td_block_fir_filter_t td_block_fir_filter_SPATIAL_71_DRAMA_v090h270_left; //This is the count of int32_t words to allocate for one data channel. //i.e. int32_t channel_data[SPATIAL_71_DRAMA_v090h270_left_DATA_BUFFER_ELEMENTS] = { 0 }; -#define SPATIAL_71_DRAMA_v090h270_left_DATA_BUFFER_ELEMENTS (1824) +#define SPATIAL_71_DRAMA_v090h270_left_DATA_BUFFER_ELEMENTS (2520) #define SPATIAL_71_DRAMA_v090h270_left_TD_BLOCK_LENGTH (8) -#define SPATIAL_71_DRAMA_v090h270_left_BLOCK_COUNT (226) +#define SPATIAL_71_DRAMA_v090h270_left_BLOCK_COUNT (313) #define SPATIAL_71_DRAMA_v090h270_left_FRAME_ADVANCE (8) #define SPATIAL_71_DRAMA_v090h270_left_FRAME_OVERLAP (0) EXTERN td_block_fir_filter_t td_block_fir_filter_SPATIAL_71_DRAMA_v090h270_right; //This is the count of int32_t words to allocate for one data channel. //i.e. int32_t channel_data[SPATIAL_71_DRAMA_v090h270_right_DATA_BUFFER_ELEMENTS] = { 0 }; -#define SPATIAL_71_DRAMA_v090h270_right_DATA_BUFFER_ELEMENTS (1824) +#define SPATIAL_71_DRAMA_v090h270_right_DATA_BUFFER_ELEMENTS (2520) #define SPATIAL_71_DRAMA_v090h270_right_TD_BLOCK_LENGTH (8) -#define SPATIAL_71_DRAMA_v090h270_right_BLOCK_COUNT (226) +#define SPATIAL_71_DRAMA_v090h270_right_BLOCK_COUNT (313) #define SPATIAL_71_DRAMA_v090h270_right_FRAME_ADVANCE (8) #define SPATIAL_71_DRAMA_v090h270_right_FRAME_OVERLAP (0) EXTERN td_block_fir_filter_t td_block_fir_filter_SPATIAL_71_DRAMA_v090h315_left; //This is the count of int32_t words to allocate for one data channel. //i.e. int32_t channel_data[SPATIAL_71_DRAMA_v090h315_left_DATA_BUFFER_ELEMENTS] = { 0 }; -#define SPATIAL_71_DRAMA_v090h315_left_DATA_BUFFER_ELEMENTS (1224) +#define SPATIAL_71_DRAMA_v090h315_left_DATA_BUFFER_ELEMENTS (2520) #define SPATIAL_71_DRAMA_v090h315_left_TD_BLOCK_LENGTH (8) -#define SPATIAL_71_DRAMA_v090h315_left_BLOCK_COUNT (151) +#define SPATIAL_71_DRAMA_v090h315_left_BLOCK_COUNT (313) #define SPATIAL_71_DRAMA_v090h315_left_FRAME_ADVANCE (8) #define SPATIAL_71_DRAMA_v090h315_left_FRAME_OVERLAP (0) EXTERN td_block_fir_filter_t td_block_fir_filter_SPATIAL_71_DRAMA_v090h315_right; //This is the count of int32_t words to allocate for one data channel. //i.e. int32_t channel_data[SPATIAL_71_DRAMA_v090h315_right_DATA_BUFFER_ELEMENTS] = { 0 }; -#define SPATIAL_71_DRAMA_v090h315_right_DATA_BUFFER_ELEMENTS (1224) +#define SPATIAL_71_DRAMA_v090h315_right_DATA_BUFFER_ELEMENTS (2520) #define SPATIAL_71_DRAMA_v090h315_right_TD_BLOCK_LENGTH (8) -#define SPATIAL_71_DRAMA_v090h315_right_BLOCK_COUNT (151) +#define SPATIAL_71_DRAMA_v090h315_right_BLOCK_COUNT (313) #define SPATIAL_71_DRAMA_v090h315_right_FRAME_ADVANCE (8) #define SPATIAL_71_DRAMA_v090h315_right_FRAME_OVERLAP (0) EXTERN td_block_fir_filter_t td_block_fir_filter_SPATIAL_71_GAME_lfe_left; //This is the count of int32_t words to allocate for one data channel. //i.e. int32_t channel_data[SPATIAL_71_GAME_lfe_left_DATA_BUFFER_ELEMENTS] = { 0 }; -#define SPATIAL_71_GAME_lfe_left_DATA_BUFFER_ELEMENTS (1224) +#define SPATIAL_71_GAME_lfe_left_DATA_BUFFER_ELEMENTS (2520) #define SPATIAL_71_GAME_lfe_left_TD_BLOCK_LENGTH (8) -#define SPATIAL_71_GAME_lfe_left_BLOCK_COUNT (151) +#define SPATIAL_71_GAME_lfe_left_BLOCK_COUNT (313) #define SPATIAL_71_GAME_lfe_left_FRAME_ADVANCE (8) #define SPATIAL_71_GAME_lfe_left_FRAME_OVERLAP (0) EXTERN td_block_fir_filter_t td_block_fir_filter_SPATIAL_71_GAME_lfe_right; //This is the count of int32_t words to allocate for one data channel. //i.e. int32_t channel_data[SPATIAL_71_GAME_lfe_right_DATA_BUFFER_ELEMENTS] = { 0 }; -#define SPATIAL_71_GAME_lfe_right_DATA_BUFFER_ELEMENTS (1224) +#define SPATIAL_71_GAME_lfe_right_DATA_BUFFER_ELEMENTS (2520) #define SPATIAL_71_GAME_lfe_right_TD_BLOCK_LENGTH (8) -#define SPATIAL_71_GAME_lfe_right_BLOCK_COUNT (151) +#define SPATIAL_71_GAME_lfe_right_BLOCK_COUNT (313) #define SPATIAL_71_GAME_lfe_right_FRAME_ADVANCE (8) #define SPATIAL_71_GAME_lfe_right_FRAME_OVERLAP (0) EXTERN td_block_fir_filter_t td_block_fir_filter_SPATIAL_71_GAME_v090h000_left; //This is the count of int32_t words to allocate for one data channel. //i.e. int32_t channel_data[SPATIAL_71_GAME_v090h000_left_DATA_BUFFER_ELEMENTS] = { 0 }; -#define SPATIAL_71_GAME_v090h000_left_DATA_BUFFER_ELEMENTS (1224) +#define SPATIAL_71_GAME_v090h000_left_DATA_BUFFER_ELEMENTS (2520) #define SPATIAL_71_GAME_v090h000_left_TD_BLOCK_LENGTH (8) -#define SPATIAL_71_GAME_v090h000_left_BLOCK_COUNT (151) +#define SPATIAL_71_GAME_v090h000_left_BLOCK_COUNT (313) #define SPATIAL_71_GAME_v090h000_left_FRAME_ADVANCE (8) #define SPATIAL_71_GAME_v090h000_left_FRAME_OVERLAP (0) EXTERN td_block_fir_filter_t td_block_fir_filter_SPATIAL_71_GAME_v090h000_right; //This is the count of int32_t words to allocate for one data channel. //i.e. int32_t channel_data[SPATIAL_71_GAME_v090h000_right_DATA_BUFFER_ELEMENTS] = { 0 }; -#define SPATIAL_71_GAME_v090h000_right_DATA_BUFFER_ELEMENTS (1224) +#define SPATIAL_71_GAME_v090h000_right_DATA_BUFFER_ELEMENTS (2520) #define SPATIAL_71_GAME_v090h000_right_TD_BLOCK_LENGTH (8) -#define SPATIAL_71_GAME_v090h000_right_BLOCK_COUNT (151) +#define SPATIAL_71_GAME_v090h000_right_BLOCK_COUNT (313) #define SPATIAL_71_GAME_v090h000_right_FRAME_ADVANCE (8) #define SPATIAL_71_GAME_v090h000_right_FRAME_OVERLAP (0) EXTERN td_block_fir_filter_t td_block_fir_filter_SPATIAL_71_GAME_v090h045_left; //This is the count of int32_t words to allocate for one data channel. //i.e. int32_t channel_data[SPATIAL_71_GAME_v090h045_left_DATA_BUFFER_ELEMENTS] = { 0 }; -#define SPATIAL_71_GAME_v090h045_left_DATA_BUFFER_ELEMENTS (1224) +#define SPATIAL_71_GAME_v090h045_left_DATA_BUFFER_ELEMENTS (2520) #define SPATIAL_71_GAME_v090h045_left_TD_BLOCK_LENGTH (8) -#define SPATIAL_71_GAME_v090h045_left_BLOCK_COUNT (151) +#define SPATIAL_71_GAME_v090h045_left_BLOCK_COUNT (313) #define SPATIAL_71_GAME_v090h045_left_FRAME_ADVANCE (8) #define SPATIAL_71_GAME_v090h045_left_FRAME_OVERLAP (0) EXTERN td_block_fir_filter_t td_block_fir_filter_SPATIAL_71_GAME_v090h045_right; //This is the count of int32_t words to allocate for one data channel. //i.e. int32_t channel_data[SPATIAL_71_GAME_v090h045_right_DATA_BUFFER_ELEMENTS] = { 0 }; -#define SPATIAL_71_GAME_v090h045_right_DATA_BUFFER_ELEMENTS (1224) +#define SPATIAL_71_GAME_v090h045_right_DATA_BUFFER_ELEMENTS (2520) #define SPATIAL_71_GAME_v090h045_right_TD_BLOCK_LENGTH (8) -#define SPATIAL_71_GAME_v090h045_right_BLOCK_COUNT (151) +#define SPATIAL_71_GAME_v090h045_right_BLOCK_COUNT (313) #define SPATIAL_71_GAME_v090h045_right_FRAME_ADVANCE (8) #define SPATIAL_71_GAME_v090h045_right_FRAME_OVERLAP (0) EXTERN td_block_fir_filter_t td_block_fir_filter_SPATIAL_71_GAME_v090h090_left; //This is the count of int32_t words to allocate for one data channel. //i.e. int32_t channel_data[SPATIAL_71_GAME_v090h090_left_DATA_BUFFER_ELEMENTS] = { 0 }; -#define SPATIAL_71_GAME_v090h090_left_DATA_BUFFER_ELEMENTS (1872) +#define SPATIAL_71_GAME_v090h090_left_DATA_BUFFER_ELEMENTS (2520) #define SPATIAL_71_GAME_v090h090_left_TD_BLOCK_LENGTH (8) -#define SPATIAL_71_GAME_v090h090_left_BLOCK_COUNT (232) +#define SPATIAL_71_GAME_v090h090_left_BLOCK_COUNT (313) #define SPATIAL_71_GAME_v090h090_left_FRAME_ADVANCE (8) #define SPATIAL_71_GAME_v090h090_left_FRAME_OVERLAP (0) EXTERN td_block_fir_filter_t td_block_fir_filter_SPATIAL_71_GAME_v090h090_right; //This is the count of int32_t words to allocate for one data channel. //i.e. int32_t channel_data[SPATIAL_71_GAME_v090h090_right_DATA_BUFFER_ELEMENTS] = { 0 }; -#define SPATIAL_71_GAME_v090h090_right_DATA_BUFFER_ELEMENTS (1872) +#define SPATIAL_71_GAME_v090h090_right_DATA_BUFFER_ELEMENTS (2520) #define SPATIAL_71_GAME_v090h090_right_TD_BLOCK_LENGTH (8) -#define SPATIAL_71_GAME_v090h090_right_BLOCK_COUNT (232) +#define SPATIAL_71_GAME_v090h090_right_BLOCK_COUNT (313) #define SPATIAL_71_GAME_v090h090_right_FRAME_ADVANCE (8) #define SPATIAL_71_GAME_v090h090_right_FRAME_OVERLAP (0) EXTERN td_block_fir_filter_t td_block_fir_filter_SPATIAL_71_GAME_v090h135_left; //This is the count of int32_t words to allocate for one data channel. //i.e. int32_t channel_data[SPATIAL_71_GAME_v090h135_left_DATA_BUFFER_ELEMENTS] = { 0 }; -#define SPATIAL_71_GAME_v090h135_left_DATA_BUFFER_ELEMENTS (1824) +#define SPATIAL_71_GAME_v090h135_left_DATA_BUFFER_ELEMENTS (2520) #define SPATIAL_71_GAME_v090h135_left_TD_BLOCK_LENGTH (8) -#define SPATIAL_71_GAME_v090h135_left_BLOCK_COUNT (226) +#define SPATIAL_71_GAME_v090h135_left_BLOCK_COUNT (313) #define SPATIAL_71_GAME_v090h135_left_FRAME_ADVANCE (8) #define SPATIAL_71_GAME_v090h135_left_FRAME_OVERLAP (0) EXTERN td_block_fir_filter_t td_block_fir_filter_SPATIAL_71_GAME_v090h135_right; //This is the count of int32_t words to allocate for one data channel. //i.e. int32_t channel_data[SPATIAL_71_GAME_v090h135_right_DATA_BUFFER_ELEMENTS] = { 0 }; -#define SPATIAL_71_GAME_v090h135_right_DATA_BUFFER_ELEMENTS (1824) +#define SPATIAL_71_GAME_v090h135_right_DATA_BUFFER_ELEMENTS (2520) #define SPATIAL_71_GAME_v090h135_right_TD_BLOCK_LENGTH (8) -#define SPATIAL_71_GAME_v090h135_right_BLOCK_COUNT (226) +#define SPATIAL_71_GAME_v090h135_right_BLOCK_COUNT (313) #define SPATIAL_71_GAME_v090h135_right_FRAME_ADVANCE (8) #define SPATIAL_71_GAME_v090h135_right_FRAME_OVERLAP (0) EXTERN td_block_fir_filter_t td_block_fir_filter_SPATIAL_71_GAME_v090h225_left; //This is the count of int32_t words to allocate for one data channel. //i.e. int32_t channel_data[SPATIAL_71_GAME_v090h225_left_DATA_BUFFER_ELEMENTS] = { 0 }; -#define SPATIAL_71_GAME_v090h225_left_DATA_BUFFER_ELEMENTS (1824) +#define SPATIAL_71_GAME_v090h225_left_DATA_BUFFER_ELEMENTS (2520) #define SPATIAL_71_GAME_v090h225_left_TD_BLOCK_LENGTH (8) -#define SPATIAL_71_GAME_v090h225_left_BLOCK_COUNT (226) +#define SPATIAL_71_GAME_v090h225_left_BLOCK_COUNT (313) #define SPATIAL_71_GAME_v090h225_left_FRAME_ADVANCE (8) #define SPATIAL_71_GAME_v090h225_left_FRAME_OVERLAP (0) EXTERN td_block_fir_filter_t td_block_fir_filter_SPATIAL_71_GAME_v090h225_right; //This is the count of int32_t words to allocate for one data channel. //i.e. int32_t channel_data[SPATIAL_71_GAME_v090h225_right_DATA_BUFFER_ELEMENTS] = { 0 }; -#define SPATIAL_71_GAME_v090h225_right_DATA_BUFFER_ELEMENTS (1824) +#define SPATIAL_71_GAME_v090h225_right_DATA_BUFFER_ELEMENTS (2520) #define SPATIAL_71_GAME_v090h225_right_TD_BLOCK_LENGTH (8) -#define SPATIAL_71_GAME_v090h225_right_BLOCK_COUNT (226) +#define SPATIAL_71_GAME_v090h225_right_BLOCK_COUNT (313) #define SPATIAL_71_GAME_v090h225_right_FRAME_ADVANCE (8) #define SPATIAL_71_GAME_v090h225_right_FRAME_OVERLAP (0) EXTERN td_block_fir_filter_t td_block_fir_filter_SPATIAL_71_GAME_v090h270_left; //This is the count of int32_t words to allocate for one data channel. //i.e. int32_t channel_data[SPATIAL_71_GAME_v090h270_left_DATA_BUFFER_ELEMENTS] = { 0 }; -#define SPATIAL_71_GAME_v090h270_left_DATA_BUFFER_ELEMENTS (1824) +#define SPATIAL_71_GAME_v090h270_left_DATA_BUFFER_ELEMENTS (2520) #define SPATIAL_71_GAME_v090h270_left_TD_BLOCK_LENGTH (8) -#define SPATIAL_71_GAME_v090h270_left_BLOCK_COUNT (226) +#define SPATIAL_71_GAME_v090h270_left_BLOCK_COUNT (313) #define SPATIAL_71_GAME_v090h270_left_FRAME_ADVANCE (8) #define SPATIAL_71_GAME_v090h270_left_FRAME_OVERLAP (0) EXTERN td_block_fir_filter_t td_block_fir_filter_SPATIAL_71_GAME_v090h270_right; //This is the count of int32_t words to allocate for one data channel. //i.e. int32_t channel_data[SPATIAL_71_GAME_v090h270_right_DATA_BUFFER_ELEMENTS] = { 0 }; -#define SPATIAL_71_GAME_v090h270_right_DATA_BUFFER_ELEMENTS (1824) +#define SPATIAL_71_GAME_v090h270_right_DATA_BUFFER_ELEMENTS (2520) #define SPATIAL_71_GAME_v090h270_right_TD_BLOCK_LENGTH (8) -#define SPATIAL_71_GAME_v090h270_right_BLOCK_COUNT (226) +#define SPATIAL_71_GAME_v090h270_right_BLOCK_COUNT (313) #define SPATIAL_71_GAME_v090h270_right_FRAME_ADVANCE (8) #define SPATIAL_71_GAME_v090h270_right_FRAME_OVERLAP (0) EXTERN td_block_fir_filter_t td_block_fir_filter_SPATIAL_71_GAME_v090h315_left; //This is the count of int32_t words to allocate for one data channel. //i.e. int32_t channel_data[SPATIAL_71_GAME_v090h315_left_DATA_BUFFER_ELEMENTS] = { 0 }; -#define SPATIAL_71_GAME_v090h315_left_DATA_BUFFER_ELEMENTS (1224) +#define SPATIAL_71_GAME_v090h315_left_DATA_BUFFER_ELEMENTS (2520) #define SPATIAL_71_GAME_v090h315_left_TD_BLOCK_LENGTH (8) -#define SPATIAL_71_GAME_v090h315_left_BLOCK_COUNT (151) +#define SPATIAL_71_GAME_v090h315_left_BLOCK_COUNT (313) #define SPATIAL_71_GAME_v090h315_left_FRAME_ADVANCE (8) #define SPATIAL_71_GAME_v090h315_left_FRAME_OVERLAP (0) EXTERN td_block_fir_filter_t td_block_fir_filter_SPATIAL_71_GAME_v090h315_right; //This is the count of int32_t words to allocate for one data channel. //i.e. int32_t channel_data[SPATIAL_71_GAME_v090h315_right_DATA_BUFFER_ELEMENTS] = { 0 }; -#define SPATIAL_71_GAME_v090h315_right_DATA_BUFFER_ELEMENTS (1224) +#define SPATIAL_71_GAME_v090h315_right_DATA_BUFFER_ELEMENTS (2520) #define SPATIAL_71_GAME_v090h315_right_TD_BLOCK_LENGTH (8) -#define SPATIAL_71_GAME_v090h315_right_BLOCK_COUNT (151) +#define SPATIAL_71_GAME_v090h315_right_BLOCK_COUNT (313) #define SPATIAL_71_GAME_v090h315_right_FRAME_ADVANCE (8) #define SPATIAL_71_GAME_v090h315_right_FRAME_OVERLAP (0) EXTERN td_block_fir_filter_t td_block_fir_filter_SPATIAL_71_MOVIE_lfe_left; //This is the count of int32_t words to allocate for one data channel. //i.e. int32_t channel_data[SPATIAL_71_MOVIE_lfe_left_DATA_BUFFER_ELEMENTS] = { 0 }; -#define SPATIAL_71_MOVIE_lfe_left_DATA_BUFFER_ELEMENTS (1224) +#define SPATIAL_71_MOVIE_lfe_left_DATA_BUFFER_ELEMENTS (2520) #define SPATIAL_71_MOVIE_lfe_left_TD_BLOCK_LENGTH (8) -#define SPATIAL_71_MOVIE_lfe_left_BLOCK_COUNT (151) +#define SPATIAL_71_MOVIE_lfe_left_BLOCK_COUNT (313) #define SPATIAL_71_MOVIE_lfe_left_FRAME_ADVANCE (8) #define SPATIAL_71_MOVIE_lfe_left_FRAME_OVERLAP (0) EXTERN td_block_fir_filter_t td_block_fir_filter_SPATIAL_71_MOVIE_lfe_right; //This is the count of int32_t words to allocate for one data channel. //i.e. int32_t channel_data[SPATIAL_71_MOVIE_lfe_right_DATA_BUFFER_ELEMENTS] = { 0 }; -#define SPATIAL_71_MOVIE_lfe_right_DATA_BUFFER_ELEMENTS (1224) +#define SPATIAL_71_MOVIE_lfe_right_DATA_BUFFER_ELEMENTS (2520) #define SPATIAL_71_MOVIE_lfe_right_TD_BLOCK_LENGTH (8) -#define SPATIAL_71_MOVIE_lfe_right_BLOCK_COUNT (151) +#define SPATIAL_71_MOVIE_lfe_right_BLOCK_COUNT (313) #define SPATIAL_71_MOVIE_lfe_right_FRAME_ADVANCE (8) #define SPATIAL_71_MOVIE_lfe_right_FRAME_OVERLAP (0) EXTERN td_block_fir_filter_t td_block_fir_filter_SPATIAL_71_MOVIE_v090h000_left; //This is the count of int32_t words to allocate for one data channel. //i.e. int32_t channel_data[SPATIAL_71_MOVIE_v090h000_left_DATA_BUFFER_ELEMENTS] = { 0 }; -#define SPATIAL_71_MOVIE_v090h000_left_DATA_BUFFER_ELEMENTS (1224) +#define SPATIAL_71_MOVIE_v090h000_left_DATA_BUFFER_ELEMENTS (2520) #define SPATIAL_71_MOVIE_v090h000_left_TD_BLOCK_LENGTH (8) -#define SPATIAL_71_MOVIE_v090h000_left_BLOCK_COUNT (151) +#define SPATIAL_71_MOVIE_v090h000_left_BLOCK_COUNT (313) #define SPATIAL_71_MOVIE_v090h000_left_FRAME_ADVANCE (8) #define SPATIAL_71_MOVIE_v090h000_left_FRAME_OVERLAP (0) EXTERN td_block_fir_filter_t td_block_fir_filter_SPATIAL_71_MOVIE_v090h000_right; //This is the count of int32_t words to allocate for one data channel. //i.e. int32_t channel_data[SPATIAL_71_MOVIE_v090h000_right_DATA_BUFFER_ELEMENTS] = { 0 }; -#define SPATIAL_71_MOVIE_v090h000_right_DATA_BUFFER_ELEMENTS (1224) +#define SPATIAL_71_MOVIE_v090h000_right_DATA_BUFFER_ELEMENTS (2520) #define SPATIAL_71_MOVIE_v090h000_right_TD_BLOCK_LENGTH (8) -#define SPATIAL_71_MOVIE_v090h000_right_BLOCK_COUNT (151) +#define SPATIAL_71_MOVIE_v090h000_right_BLOCK_COUNT (313) #define SPATIAL_71_MOVIE_v090h000_right_FRAME_ADVANCE (8) #define SPATIAL_71_MOVIE_v090h000_right_FRAME_OVERLAP (0) EXTERN td_block_fir_filter_t td_block_fir_filter_SPATIAL_71_MOVIE_v090h045_left; //This is the count of int32_t words to allocate for one data channel. //i.e. int32_t channel_data[SPATIAL_71_MOVIE_v090h045_left_DATA_BUFFER_ELEMENTS] = { 0 }; -#define SPATIAL_71_MOVIE_v090h045_left_DATA_BUFFER_ELEMENTS (1224) +#define SPATIAL_71_MOVIE_v090h045_left_DATA_BUFFER_ELEMENTS (2520) #define SPATIAL_71_MOVIE_v090h045_left_TD_BLOCK_LENGTH (8) -#define SPATIAL_71_MOVIE_v090h045_left_BLOCK_COUNT (151) +#define SPATIAL_71_MOVIE_v090h045_left_BLOCK_COUNT (313) #define SPATIAL_71_MOVIE_v090h045_left_FRAME_ADVANCE (8) #define SPATIAL_71_MOVIE_v090h045_left_FRAME_OVERLAP (0) EXTERN td_block_fir_filter_t td_block_fir_filter_SPATIAL_71_MOVIE_v090h045_right; //This is the count of int32_t words to allocate for one data channel. //i.e. int32_t channel_data[SPATIAL_71_MOVIE_v090h045_right_DATA_BUFFER_ELEMENTS] = { 0 }; -#define SPATIAL_71_MOVIE_v090h045_right_DATA_BUFFER_ELEMENTS (1224) +#define SPATIAL_71_MOVIE_v090h045_right_DATA_BUFFER_ELEMENTS (2520) #define SPATIAL_71_MOVIE_v090h045_right_TD_BLOCK_LENGTH (8) -#define SPATIAL_71_MOVIE_v090h045_right_BLOCK_COUNT (151) +#define SPATIAL_71_MOVIE_v090h045_right_BLOCK_COUNT (313) #define SPATIAL_71_MOVIE_v090h045_right_FRAME_ADVANCE (8) #define SPATIAL_71_MOVIE_v090h045_right_FRAME_OVERLAP (0) EXTERN td_block_fir_filter_t td_block_fir_filter_SPATIAL_71_MOVIE_v090h090_left; //This is the count of int32_t words to allocate for one data channel. //i.e. int32_t channel_data[SPATIAL_71_MOVIE_v090h090_left_DATA_BUFFER_ELEMENTS] = { 0 }; -#define SPATIAL_71_MOVIE_v090h090_left_DATA_BUFFER_ELEMENTS (1872) +#define SPATIAL_71_MOVIE_v090h090_left_DATA_BUFFER_ELEMENTS (2520) #define SPATIAL_71_MOVIE_v090h090_left_TD_BLOCK_LENGTH (8) -#define SPATIAL_71_MOVIE_v090h090_left_BLOCK_COUNT (232) +#define SPATIAL_71_MOVIE_v090h090_left_BLOCK_COUNT (313) #define SPATIAL_71_MOVIE_v090h090_left_FRAME_ADVANCE (8) #define SPATIAL_71_MOVIE_v090h090_left_FRAME_OVERLAP (0) EXTERN td_block_fir_filter_t td_block_fir_filter_SPATIAL_71_MOVIE_v090h090_right; //This is the count of int32_t words to allocate for one data channel. //i.e. int32_t channel_data[SPATIAL_71_MOVIE_v090h090_right_DATA_BUFFER_ELEMENTS] = { 0 }; -#define SPATIAL_71_MOVIE_v090h090_right_DATA_BUFFER_ELEMENTS (1872) +#define SPATIAL_71_MOVIE_v090h090_right_DATA_BUFFER_ELEMENTS (2520) #define SPATIAL_71_MOVIE_v090h090_right_TD_BLOCK_LENGTH (8) -#define SPATIAL_71_MOVIE_v090h090_right_BLOCK_COUNT (232) +#define SPATIAL_71_MOVIE_v090h090_right_BLOCK_COUNT (313) #define SPATIAL_71_MOVIE_v090h090_right_FRAME_ADVANCE (8) #define SPATIAL_71_MOVIE_v090h090_right_FRAME_OVERLAP (0) EXTERN td_block_fir_filter_t td_block_fir_filter_SPATIAL_71_MOVIE_v090h135_left; //This is the count of int32_t words to allocate for one data channel. //i.e. int32_t channel_data[SPATIAL_71_MOVIE_v090h135_left_DATA_BUFFER_ELEMENTS] = { 0 }; -#define SPATIAL_71_MOVIE_v090h135_left_DATA_BUFFER_ELEMENTS (1824) +#define SPATIAL_71_MOVIE_v090h135_left_DATA_BUFFER_ELEMENTS (2520) #define SPATIAL_71_MOVIE_v090h135_left_TD_BLOCK_LENGTH (8) -#define SPATIAL_71_MOVIE_v090h135_left_BLOCK_COUNT (226) +#define SPATIAL_71_MOVIE_v090h135_left_BLOCK_COUNT (313) #define SPATIAL_71_MOVIE_v090h135_left_FRAME_ADVANCE (8) #define SPATIAL_71_MOVIE_v090h135_left_FRAME_OVERLAP (0) EXTERN td_block_fir_filter_t td_block_fir_filter_SPATIAL_71_MOVIE_v090h135_right; //This is the count of int32_t words to allocate for one data channel. //i.e. int32_t channel_data[SPATIAL_71_MOVIE_v090h135_right_DATA_BUFFER_ELEMENTS] = { 0 }; -#define SPATIAL_71_MOVIE_v090h135_right_DATA_BUFFER_ELEMENTS (1824) +#define SPATIAL_71_MOVIE_v090h135_right_DATA_BUFFER_ELEMENTS (2520) #define SPATIAL_71_MOVIE_v090h135_right_TD_BLOCK_LENGTH (8) -#define SPATIAL_71_MOVIE_v090h135_right_BLOCK_COUNT (226) +#define SPATIAL_71_MOVIE_v090h135_right_BLOCK_COUNT (313) #define SPATIAL_71_MOVIE_v090h135_right_FRAME_ADVANCE (8) #define SPATIAL_71_MOVIE_v090h135_right_FRAME_OVERLAP (0) EXTERN td_block_fir_filter_t td_block_fir_filter_SPATIAL_71_MOVIE_v090h225_left; //This is the count of int32_t words to allocate for one data channel. //i.e. int32_t channel_data[SPATIAL_71_MOVIE_v090h225_left_DATA_BUFFER_ELEMENTS] = { 0 }; -#define SPATIAL_71_MOVIE_v090h225_left_DATA_BUFFER_ELEMENTS (1824) +#define SPATIAL_71_MOVIE_v090h225_left_DATA_BUFFER_ELEMENTS (2520) #define SPATIAL_71_MOVIE_v090h225_left_TD_BLOCK_LENGTH (8) -#define SPATIAL_71_MOVIE_v090h225_left_BLOCK_COUNT (226) +#define SPATIAL_71_MOVIE_v090h225_left_BLOCK_COUNT (313) #define SPATIAL_71_MOVIE_v090h225_left_FRAME_ADVANCE (8) #define SPATIAL_71_MOVIE_v090h225_left_FRAME_OVERLAP (0) EXTERN td_block_fir_filter_t td_block_fir_filter_SPATIAL_71_MOVIE_v090h225_right; //This is the count of int32_t words to allocate for one data channel. //i.e. int32_t channel_data[SPATIAL_71_MOVIE_v090h225_right_DATA_BUFFER_ELEMENTS] = { 0 }; -#define SPATIAL_71_MOVIE_v090h225_right_DATA_BUFFER_ELEMENTS (1824) +#define SPATIAL_71_MOVIE_v090h225_right_DATA_BUFFER_ELEMENTS (2520) #define SPATIAL_71_MOVIE_v090h225_right_TD_BLOCK_LENGTH (8) -#define SPATIAL_71_MOVIE_v090h225_right_BLOCK_COUNT (226) +#define SPATIAL_71_MOVIE_v090h225_right_BLOCK_COUNT (313) #define SPATIAL_71_MOVIE_v090h225_right_FRAME_ADVANCE (8) #define SPATIAL_71_MOVIE_v090h225_right_FRAME_OVERLAP (0) EXTERN td_block_fir_filter_t td_block_fir_filter_SPATIAL_71_MOVIE_v090h270_left; //This is the count of int32_t words to allocate for one data channel. //i.e. int32_t channel_data[SPATIAL_71_MOVIE_v090h270_left_DATA_BUFFER_ELEMENTS] = { 0 }; -#define SPATIAL_71_MOVIE_v090h270_left_DATA_BUFFER_ELEMENTS (1824) +#define SPATIAL_71_MOVIE_v090h270_left_DATA_BUFFER_ELEMENTS (2520) #define SPATIAL_71_MOVIE_v090h270_left_TD_BLOCK_LENGTH (8) -#define SPATIAL_71_MOVIE_v090h270_left_BLOCK_COUNT (226) +#define SPATIAL_71_MOVIE_v090h270_left_BLOCK_COUNT (313) #define SPATIAL_71_MOVIE_v090h270_left_FRAME_ADVANCE (8) #define SPATIAL_71_MOVIE_v090h270_left_FRAME_OVERLAP (0) EXTERN td_block_fir_filter_t td_block_fir_filter_SPATIAL_71_MOVIE_v090h270_right; //This is the count of int32_t words to allocate for one data channel. //i.e. int32_t channel_data[SPATIAL_71_MOVIE_v090h270_right_DATA_BUFFER_ELEMENTS] = { 0 }; -#define SPATIAL_71_MOVIE_v090h270_right_DATA_BUFFER_ELEMENTS (1824) +#define SPATIAL_71_MOVIE_v090h270_right_DATA_BUFFER_ELEMENTS (2520) #define SPATIAL_71_MOVIE_v090h270_right_TD_BLOCK_LENGTH (8) -#define SPATIAL_71_MOVIE_v090h270_right_BLOCK_COUNT (226) +#define SPATIAL_71_MOVIE_v090h270_right_BLOCK_COUNT (313) #define SPATIAL_71_MOVIE_v090h270_right_FRAME_ADVANCE (8) #define SPATIAL_71_MOVIE_v090h270_right_FRAME_OVERLAP (0) EXTERN td_block_fir_filter_t td_block_fir_filter_SPATIAL_71_MOVIE_v090h315_left; //This is the count of int32_t words to allocate for one data channel. //i.e. int32_t channel_data[SPATIAL_71_MOVIE_v090h315_left_DATA_BUFFER_ELEMENTS] = { 0 }; -#define SPATIAL_71_MOVIE_v090h315_left_DATA_BUFFER_ELEMENTS (1224) +#define SPATIAL_71_MOVIE_v090h315_left_DATA_BUFFER_ELEMENTS (2520) #define SPATIAL_71_MOVIE_v090h315_left_TD_BLOCK_LENGTH (8) -#define SPATIAL_71_MOVIE_v090h315_left_BLOCK_COUNT (151) +#define SPATIAL_71_MOVIE_v090h315_left_BLOCK_COUNT (313) #define SPATIAL_71_MOVIE_v090h315_left_FRAME_ADVANCE (8) #define SPATIAL_71_MOVIE_v090h315_left_FRAME_OVERLAP (0) EXTERN td_block_fir_filter_t td_block_fir_filter_SPATIAL_71_MOVIE_v090h315_right; //This is the count of int32_t words to allocate for one data channel. //i.e. int32_t channel_data[SPATIAL_71_MOVIE_v090h315_right_DATA_BUFFER_ELEMENTS] = { 0 }; -#define SPATIAL_71_MOVIE_v090h315_right_DATA_BUFFER_ELEMENTS (1224) +#define SPATIAL_71_MOVIE_v090h315_right_DATA_BUFFER_ELEMENTS (2520) #define SPATIAL_71_MOVIE_v090h315_right_TD_BLOCK_LENGTH (8) -#define SPATIAL_71_MOVIE_v090h315_right_BLOCK_COUNT (151) +#define SPATIAL_71_MOVIE_v090h315_right_BLOCK_COUNT (313) #define SPATIAL_71_MOVIE_v090h315_right_FRAME_ADVANCE (8) #define SPATIAL_71_MOVIE_v090h315_right_FRAME_OVERLAP (0) EXTERN td_block_fir_filter_t td_block_fir_filter_SPATIAL_71_MUSIC_lfe_left; //This is the count of int32_t words to allocate for one data channel. //i.e. int32_t channel_data[SPATIAL_71_MUSIC_lfe_left_DATA_BUFFER_ELEMENTS] = { 0 }; -#define SPATIAL_71_MUSIC_lfe_left_DATA_BUFFER_ELEMENTS (1224) +#define SPATIAL_71_MUSIC_lfe_left_DATA_BUFFER_ELEMENTS (2520) #define SPATIAL_71_MUSIC_lfe_left_TD_BLOCK_LENGTH (8) -#define SPATIAL_71_MUSIC_lfe_left_BLOCK_COUNT (151) +#define SPATIAL_71_MUSIC_lfe_left_BLOCK_COUNT (313) #define SPATIAL_71_MUSIC_lfe_left_FRAME_ADVANCE (8) #define SPATIAL_71_MUSIC_lfe_left_FRAME_OVERLAP (0) EXTERN td_block_fir_filter_t td_block_fir_filter_SPATIAL_71_MUSIC_lfe_right; //This is the count of int32_t words to allocate for one data channel. //i.e. int32_t channel_data[SPATIAL_71_MUSIC_lfe_right_DATA_BUFFER_ELEMENTS] = { 0 }; -#define SPATIAL_71_MUSIC_lfe_right_DATA_BUFFER_ELEMENTS (1224) +#define SPATIAL_71_MUSIC_lfe_right_DATA_BUFFER_ELEMENTS (2520) #define SPATIAL_71_MUSIC_lfe_right_TD_BLOCK_LENGTH (8) -#define SPATIAL_71_MUSIC_lfe_right_BLOCK_COUNT (151) +#define SPATIAL_71_MUSIC_lfe_right_BLOCK_COUNT (313) #define SPATIAL_71_MUSIC_lfe_right_FRAME_ADVANCE (8) #define SPATIAL_71_MUSIC_lfe_right_FRAME_OVERLAP (0) EXTERN td_block_fir_filter_t td_block_fir_filter_SPATIAL_71_MUSIC_v090h000_left; //This is the count of int32_t words to allocate for one data channel. //i.e. int32_t channel_data[SPATIAL_71_MUSIC_v090h000_left_DATA_BUFFER_ELEMENTS] = { 0 }; -#define SPATIAL_71_MUSIC_v090h000_left_DATA_BUFFER_ELEMENTS (1224) +#define SPATIAL_71_MUSIC_v090h000_left_DATA_BUFFER_ELEMENTS (2520) #define SPATIAL_71_MUSIC_v090h000_left_TD_BLOCK_LENGTH (8) -#define SPATIAL_71_MUSIC_v090h000_left_BLOCK_COUNT (151) +#define SPATIAL_71_MUSIC_v090h000_left_BLOCK_COUNT (313) #define SPATIAL_71_MUSIC_v090h000_left_FRAME_ADVANCE (8) #define SPATIAL_71_MUSIC_v090h000_left_FRAME_OVERLAP (0) EXTERN td_block_fir_filter_t td_block_fir_filter_SPATIAL_71_MUSIC_v090h000_right; //This is the count of int32_t words to allocate for one data channel. //i.e. int32_t channel_data[SPATIAL_71_MUSIC_v090h000_right_DATA_BUFFER_ELEMENTS] = { 0 }; -#define SPATIAL_71_MUSIC_v090h000_right_DATA_BUFFER_ELEMENTS (1224) +#define SPATIAL_71_MUSIC_v090h000_right_DATA_BUFFER_ELEMENTS (2520) #define SPATIAL_71_MUSIC_v090h000_right_TD_BLOCK_LENGTH (8) -#define SPATIAL_71_MUSIC_v090h000_right_BLOCK_COUNT (151) +#define SPATIAL_71_MUSIC_v090h000_right_BLOCK_COUNT (313) #define SPATIAL_71_MUSIC_v090h000_right_FRAME_ADVANCE (8) #define SPATIAL_71_MUSIC_v090h000_right_FRAME_OVERLAP (0) EXTERN td_block_fir_filter_t td_block_fir_filter_SPATIAL_71_MUSIC_v090h045_left; //This is the count of int32_t words to allocate for one data channel. //i.e. int32_t channel_data[SPATIAL_71_MUSIC_v090h045_left_DATA_BUFFER_ELEMENTS] = { 0 }; -#define SPATIAL_71_MUSIC_v090h045_left_DATA_BUFFER_ELEMENTS (1224) +#define SPATIAL_71_MUSIC_v090h045_left_DATA_BUFFER_ELEMENTS (2520) #define SPATIAL_71_MUSIC_v090h045_left_TD_BLOCK_LENGTH (8) -#define SPATIAL_71_MUSIC_v090h045_left_BLOCK_COUNT (151) +#define SPATIAL_71_MUSIC_v090h045_left_BLOCK_COUNT (313) #define SPATIAL_71_MUSIC_v090h045_left_FRAME_ADVANCE (8) #define SPATIAL_71_MUSIC_v090h045_left_FRAME_OVERLAP (0) EXTERN td_block_fir_filter_t td_block_fir_filter_SPATIAL_71_MUSIC_v090h045_right; //This is the count of int32_t words to allocate for one data channel. //i.e. int32_t channel_data[SPATIAL_71_MUSIC_v090h045_right_DATA_BUFFER_ELEMENTS] = { 0 }; -#define SPATIAL_71_MUSIC_v090h045_right_DATA_BUFFER_ELEMENTS (1224) +#define SPATIAL_71_MUSIC_v090h045_right_DATA_BUFFER_ELEMENTS (2520) #define SPATIAL_71_MUSIC_v090h045_right_TD_BLOCK_LENGTH (8) -#define SPATIAL_71_MUSIC_v090h045_right_BLOCK_COUNT (151) +#define SPATIAL_71_MUSIC_v090h045_right_BLOCK_COUNT (313) #define SPATIAL_71_MUSIC_v090h045_right_FRAME_ADVANCE (8) #define SPATIAL_71_MUSIC_v090h045_right_FRAME_OVERLAP (0) EXTERN td_block_fir_filter_t td_block_fir_filter_SPATIAL_71_MUSIC_v090h090_left; //This is the count of int32_t words to allocate for one data channel. //i.e. int32_t channel_data[SPATIAL_71_MUSIC_v090h090_left_DATA_BUFFER_ELEMENTS] = { 0 }; -#define SPATIAL_71_MUSIC_v090h090_left_DATA_BUFFER_ELEMENTS (1872) +#define SPATIAL_71_MUSIC_v090h090_left_DATA_BUFFER_ELEMENTS (2520) #define SPATIAL_71_MUSIC_v090h090_left_TD_BLOCK_LENGTH (8) -#define SPATIAL_71_MUSIC_v090h090_left_BLOCK_COUNT (232) +#define SPATIAL_71_MUSIC_v090h090_left_BLOCK_COUNT (313) #define SPATIAL_71_MUSIC_v090h090_left_FRAME_ADVANCE (8) #define SPATIAL_71_MUSIC_v090h090_left_FRAME_OVERLAP (0) EXTERN td_block_fir_filter_t td_block_fir_filter_SPATIAL_71_MUSIC_v090h090_right; //This is the count of int32_t words to allocate for one data channel. //i.e. int32_t channel_data[SPATIAL_71_MUSIC_v090h090_right_DATA_BUFFER_ELEMENTS] = { 0 }; -#define SPATIAL_71_MUSIC_v090h090_right_DATA_BUFFER_ELEMENTS (1872) +#define SPATIAL_71_MUSIC_v090h090_right_DATA_BUFFER_ELEMENTS (2520) #define SPATIAL_71_MUSIC_v090h090_right_TD_BLOCK_LENGTH (8) -#define SPATIAL_71_MUSIC_v090h090_right_BLOCK_COUNT (232) +#define SPATIAL_71_MUSIC_v090h090_right_BLOCK_COUNT (313) #define SPATIAL_71_MUSIC_v090h090_right_FRAME_ADVANCE (8) #define SPATIAL_71_MUSIC_v090h090_right_FRAME_OVERLAP (0) EXTERN td_block_fir_filter_t td_block_fir_filter_SPATIAL_71_MUSIC_v090h135_left; //This is the count of int32_t words to allocate for one data channel. //i.e. int32_t channel_data[SPATIAL_71_MUSIC_v090h135_left_DATA_BUFFER_ELEMENTS] = { 0 }; -#define SPATIAL_71_MUSIC_v090h135_left_DATA_BUFFER_ELEMENTS (1824) +#define SPATIAL_71_MUSIC_v090h135_left_DATA_BUFFER_ELEMENTS (2520) #define SPATIAL_71_MUSIC_v090h135_left_TD_BLOCK_LENGTH (8) -#define SPATIAL_71_MUSIC_v090h135_left_BLOCK_COUNT (226) +#define SPATIAL_71_MUSIC_v090h135_left_BLOCK_COUNT (313) #define SPATIAL_71_MUSIC_v090h135_left_FRAME_ADVANCE (8) #define SPATIAL_71_MUSIC_v090h135_left_FRAME_OVERLAP (0) EXTERN td_block_fir_filter_t td_block_fir_filter_SPATIAL_71_MUSIC_v090h135_right; //This is the count of int32_t words to allocate for one data channel. //i.e. int32_t channel_data[SPATIAL_71_MUSIC_v090h135_right_DATA_BUFFER_ELEMENTS] = { 0 }; -#define SPATIAL_71_MUSIC_v090h135_right_DATA_BUFFER_ELEMENTS (1824) +#define SPATIAL_71_MUSIC_v090h135_right_DATA_BUFFER_ELEMENTS (2520) #define SPATIAL_71_MUSIC_v090h135_right_TD_BLOCK_LENGTH (8) -#define SPATIAL_71_MUSIC_v090h135_right_BLOCK_COUNT (226) +#define SPATIAL_71_MUSIC_v090h135_right_BLOCK_COUNT (313) #define SPATIAL_71_MUSIC_v090h135_right_FRAME_ADVANCE (8) #define SPATIAL_71_MUSIC_v090h135_right_FRAME_OVERLAP (0) EXTERN td_block_fir_filter_t td_block_fir_filter_SPATIAL_71_MUSIC_v090h225_left; //This is the count of int32_t words to allocate for one data channel. //i.e. int32_t channel_data[SPATIAL_71_MUSIC_v090h225_left_DATA_BUFFER_ELEMENTS] = { 0 }; -#define SPATIAL_71_MUSIC_v090h225_left_DATA_BUFFER_ELEMENTS (1824) +#define SPATIAL_71_MUSIC_v090h225_left_DATA_BUFFER_ELEMENTS (2520) #define SPATIAL_71_MUSIC_v090h225_left_TD_BLOCK_LENGTH (8) -#define SPATIAL_71_MUSIC_v090h225_left_BLOCK_COUNT (226) +#define SPATIAL_71_MUSIC_v090h225_left_BLOCK_COUNT (313) #define SPATIAL_71_MUSIC_v090h225_left_FRAME_ADVANCE (8) #define SPATIAL_71_MUSIC_v090h225_left_FRAME_OVERLAP (0) EXTERN td_block_fir_filter_t td_block_fir_filter_SPATIAL_71_MUSIC_v090h225_right; //This is the count of int32_t words to allocate for one data channel. //i.e. int32_t channel_data[SPATIAL_71_MUSIC_v090h225_right_DATA_BUFFER_ELEMENTS] = { 0 }; -#define SPATIAL_71_MUSIC_v090h225_right_DATA_BUFFER_ELEMENTS (1824) +#define SPATIAL_71_MUSIC_v090h225_right_DATA_BUFFER_ELEMENTS (2520) #define SPATIAL_71_MUSIC_v090h225_right_TD_BLOCK_LENGTH (8) -#define SPATIAL_71_MUSIC_v090h225_right_BLOCK_COUNT (226) +#define SPATIAL_71_MUSIC_v090h225_right_BLOCK_COUNT (313) #define SPATIAL_71_MUSIC_v090h225_right_FRAME_ADVANCE (8) #define SPATIAL_71_MUSIC_v090h225_right_FRAME_OVERLAP (0) EXTERN td_block_fir_filter_t td_block_fir_filter_SPATIAL_71_MUSIC_v090h270_left; //This is the count of int32_t words to allocate for one data channel. //i.e. int32_t channel_data[SPATIAL_71_MUSIC_v090h270_left_DATA_BUFFER_ELEMENTS] = { 0 }; -#define SPATIAL_71_MUSIC_v090h270_left_DATA_BUFFER_ELEMENTS (1824) +#define SPATIAL_71_MUSIC_v090h270_left_DATA_BUFFER_ELEMENTS (2520) #define SPATIAL_71_MUSIC_v090h270_left_TD_BLOCK_LENGTH (8) -#define SPATIAL_71_MUSIC_v090h270_left_BLOCK_COUNT (226) +#define SPATIAL_71_MUSIC_v090h270_left_BLOCK_COUNT (313) #define SPATIAL_71_MUSIC_v090h270_left_FRAME_ADVANCE (8) #define SPATIAL_71_MUSIC_v090h270_left_FRAME_OVERLAP (0) EXTERN td_block_fir_filter_t td_block_fir_filter_SPATIAL_71_MUSIC_v090h270_right; //This is the count of int32_t words to allocate for one data channel. //i.e. int32_t channel_data[SPATIAL_71_MUSIC_v090h270_right_DATA_BUFFER_ELEMENTS] = { 0 }; -#define SPATIAL_71_MUSIC_v090h270_right_DATA_BUFFER_ELEMENTS (1824) +#define SPATIAL_71_MUSIC_v090h270_right_DATA_BUFFER_ELEMENTS (2520) #define SPATIAL_71_MUSIC_v090h270_right_TD_BLOCK_LENGTH (8) -#define SPATIAL_71_MUSIC_v090h270_right_BLOCK_COUNT (226) +#define SPATIAL_71_MUSIC_v090h270_right_BLOCK_COUNT (313) #define SPATIAL_71_MUSIC_v090h270_right_FRAME_ADVANCE (8) #define SPATIAL_71_MUSIC_v090h270_right_FRAME_OVERLAP (0) EXTERN td_block_fir_filter_t td_block_fir_filter_SPATIAL_71_MUSIC_v090h315_left; //This is the count of int32_t words to allocate for one data channel. //i.e. int32_t channel_data[SPATIAL_71_MUSIC_v090h315_left_DATA_BUFFER_ELEMENTS] = { 0 }; -#define SPATIAL_71_MUSIC_v090h315_left_DATA_BUFFER_ELEMENTS (1224) +#define SPATIAL_71_MUSIC_v090h315_left_DATA_BUFFER_ELEMENTS (2520) #define SPATIAL_71_MUSIC_v090h315_left_TD_BLOCK_LENGTH (8) -#define SPATIAL_71_MUSIC_v090h315_left_BLOCK_COUNT (151) +#define SPATIAL_71_MUSIC_v090h315_left_BLOCK_COUNT (313) #define SPATIAL_71_MUSIC_v090h315_left_FRAME_ADVANCE (8) #define SPATIAL_71_MUSIC_v090h315_left_FRAME_OVERLAP (0) EXTERN td_block_fir_filter_t td_block_fir_filter_SPATIAL_71_MUSIC_v090h315_right; //This is the count of int32_t words to allocate for one data channel. //i.e. int32_t channel_data[SPATIAL_71_MUSIC_v090h315_right_DATA_BUFFER_ELEMENTS] = { 0 }; -#define SPATIAL_71_MUSIC_v090h315_right_DATA_BUFFER_ELEMENTS (1224) +#define SPATIAL_71_MUSIC_v090h315_right_DATA_BUFFER_ELEMENTS (2520) #define SPATIAL_71_MUSIC_v090h315_right_TD_BLOCK_LENGTH (8) -#define SPATIAL_71_MUSIC_v090h315_right_BLOCK_COUNT (151) +#define SPATIAL_71_MUSIC_v090h315_right_BLOCK_COUNT (313) #define SPATIAL_71_MUSIC_v090h315_right_FRAME_ADVANCE (8) #define SPATIAL_71_MUSIC_v090h315_right_FRAME_OVERLAP (0) EXTERN td_block_fir_filter_t td_block_fir_filter_SPATIAL_STEREO_2K_v090h090_left; diff --git a/lib_ex3d/lib_ex3d/api/audio_ex3d_control.h b/lib_ex3d/lib_ex3d/api/audio_ex3d_control.h index 102167a..38e7565 100644 --- a/lib_ex3d/lib_ex3d/api/audio_ex3d_control.h +++ b/lib_ex3d/lib_ex3d/api/audio_ex3d_control.h @@ -30,9 +30,7 @@ #endif #define EX3D_SET_CH_NUM NUM_USB_CHAN_OUT -#ifndef EX3D_SF_NUM -#define EX3D_SF_NUM 6 -#endif +#define EX3D_SF_NUM 1 EXTERN void audio_ex3d_load_key(chanend_t c); EXTERN int audio_ex3d_activate_key(chanend_t c); diff --git a/lib_ex3d/lib_ex3d/lib/liblib_ex3d_drama.a b/lib_ex3d/lib_ex3d/lib/liblib_ex3d_drama.a new file mode 100644 index 0000000..4cf232f Binary files /dev/null and b/lib_ex3d/lib_ex3d/lib/liblib_ex3d_drama.a differ diff --git a/lib_ex3d/lib_ex3d/lib/liblib_ex3d_game.a b/lib_ex3d/lib_ex3d/lib/liblib_ex3d_game.a new file mode 100644 index 0000000..d561d72 Binary files /dev/null and b/lib_ex3d/lib_ex3d/lib/liblib_ex3d_game.a differ diff --git a/lib_ex3d/lib_ex3d/lib/liblib_ex3d_movie.a b/lib_ex3d/lib_ex3d/lib/liblib_ex3d_movie.a new file mode 100644 index 0000000..4f868e1 Binary files /dev/null and b/lib_ex3d/lib_ex3d/lib/liblib_ex3d_movie.a differ diff --git a/lib_ex3d/lib_ex3d/lib/liblib_ex3d_all.a b/lib_ex3d/lib_ex3d/lib/liblib_ex3d_music.a similarity index 57% rename from lib_ex3d/lib_ex3d/lib/liblib_ex3d_all.a rename to lib_ex3d/lib_ex3d/lib/liblib_ex3d_music.a index f301d18..1c05cd8 100644 Binary files a/lib_ex3d/lib_ex3d/lib/liblib_ex3d_all.a and b/lib_ex3d/lib_ex3d/lib/liblib_ex3d_music.a differ diff --git a/lib_ex3d/lib_ex3d/lib/liblib_ex3d_stereo_2k.a b/lib_ex3d/lib_ex3d/lib/liblib_ex3d_stereo_2k.a new file mode 100644 index 0000000..1824e78 Binary files /dev/null and b/lib_ex3d/lib_ex3d/lib/liblib_ex3d_stereo_2k.a differ diff --git a/lib_ex3d/lib_ex3d/lib/liblib_ex3d_stereo_8k.a b/lib_ex3d/lib_ex3d/lib/liblib_ex3d_stereo_8k.a new file mode 100644 index 0000000..743beea Binary files /dev/null and b/lib_ex3d/lib_ex3d/lib/liblib_ex3d_stereo_8k.a differ diff --git a/sw_usb_audio/app_usb_aud_phaten_golden_6ch/CMakeLists.txt b/sw_usb_audio/app_usb_aud_phaten_golden_6ch/CMakeLists.txt index 40dc9fc..596c5dc 100644 --- a/sw_usb_audio/app_usb_aud_phaten_golden_6ch/CMakeLists.txt +++ b/sw_usb_audio/app_usb_aud_phaten_golden_6ch/CMakeLists.txt @@ -75,100 +75,100 @@ set(SW_USB_FACT_FLAGS ${EXTRA_BUILD_FLAGS} -Os LINK_DIRECTORIES(${CMAKE_CURRENT_LIST_DIR}/../../lib_dnr/lib_dnr) -set(APP_COMPILER_FLAGS_f5_music_uac1 ${SW_USB_AUDIO_FLAGS} -DI2S_CHANS_DAC=2 - -DI2S_CHANS_ADC=2 - -DAUDIO_CLASS=1 - -DMIN_FREQ=48000 - -DMAX_FREQ=48000 - -DMCLK_441=512*44100 - -DMCLK_48=512*48000 - -DUAC1_MODE=1 - -DF5_MUSIC_UAC1=1 - #-DUSE_EX3D - -DMIXER=0 - #-ldnr_11ms - #-DDNR_ENABLE=1 - #-llib_ex3d_all - -DEQ_EN=1 - -DEX3D_SF_NUM=3 - -DNUM_USB_CHAN_OUT=8 - -DNUM_USB_CHAN_OUT_FS=2 - -DNUM_USB_CHAN_IN=2 - -DSTREAM_FORMAT_OUTPUT_1_RESOLUTION_BITS=16 - -DSTREAM_FORMAT_INPUT_1_RESOLUTION_BITS=16 - -DINPUT_FORMAT_COUNT=1 - -DOUTPUT_FORMAT_COUNT=1 - #-DNUM_EX3D_CHAN_OUT=2 - -DMIN_VOLUME=0xE000 - -DINPUT_VOLUME_CONTROL=0 - -DOUTPUT_VOLUME_CONTROL=0 - #-DDEBUG_MEMORY_LOG_ENABLED=1 - -DXUA_DFU_EN=0 - -DHID_DFU_EN=1 - -DHID_CONTROLS_UAC1=1 - #-DIR_SWITCHING_MODE - -DHID_CONTROLS=1) +#set(APP_COMPILER_FLAGS_f5_music_uac1 ${SW_USB_AUDIO_FLAGS} -DI2S_CHANS_DAC=2 +# -DI2S_CHANS_ADC=2 +# -DAUDIO_CLASS=1 +# -DMIN_FREQ=48000 +# -DMAX_FREQ=48000 +# -DMCLK_441=512*44100 +# -DMCLK_48=512*48000 +# -DUAC1_MODE=1 +# -DF5_MUSIC_UAC1=1 +# #-DUSE_EX3D +# -DMIXER=0 +# #-ldnr_11ms +# #-DDNR_ENABLE=1 +# #-llib_ex3d_all +# -DEQ_EN=1 +# -DEX3D_SF_NUM=3 +# -DNUM_USB_CHAN_OUT=8 +# -DNUM_USB_CHAN_OUT_FS=2 +# -DNUM_USB_CHAN_IN=2 +# -DSTREAM_FORMAT_OUTPUT_1_RESOLUTION_BITS=16 +# -DSTREAM_FORMAT_INPUT_1_RESOLUTION_BITS=16 +# -DINPUT_FORMAT_COUNT=1 +# -DOUTPUT_FORMAT_COUNT=1 +# #-DNUM_EX3D_CHAN_OUT=2 +# -DMIN_VOLUME=0xE000 +# -DINPUT_VOLUME_CONTROL=0 +# -DOUTPUT_VOLUME_CONTROL=0 +# #-DDEBUG_MEMORY_LOG_ENABLED=1 +# -DXUA_DFU_EN=0 +# -DHID_DFU_EN=1 +# -DHID_CONTROLS_UAC1=1 +# #-DIR_SWITCHING_MODE +# -DHID_CONTROLS=1) +# +# +# +#set(APP_COMPILER_FLAGS_fact ${SW_USB_FACT_FLAGS} -DI2S_CHANS_DAC=2 +# -DI2S_CHANS_ADC=0 +# -DMIN_FREQ=48000 +# -DMAX_FREQ=48000 +# -DFACT=1 +# #-DUSE_EX3D +# -DMIXER=0 +# -DUAC2_MODE=1 +# #-ldnr_50ms +# #-llib_ex3d_all +# #-DEQ_EN=1 +# #-DEX3D_SF_NUM=3 +# -DNUM_USB_CHAN_OUT=2 +# -DNUM_USB_CHAN_IN=0 +# #-DNUM_EX3D_CHAN_OUT=2 +# -DMIN_VOLUME=0xE000 +# -DINPUT_VOLUME_CONTROL=0 +# -DOUTPUT_VOLUME_CONTROL=0 +# -DDEBUG_MEMORY_LOG_ENABLED=1 +# -DHID_DFU_EN=1 +# -DXUA_DFU_EN=1 +# #-DIR_SWITCHING_MODE +# -DHID_CONTROLS=1) -set(APP_COMPILER_FLAGS_fact ${SW_USB_FACT_FLAGS} -DI2S_CHANS_DAC=2 - -DI2S_CHANS_ADC=0 - -DMIN_FREQ=48000 - -DMAX_FREQ=48000 - -DFACT=1 - #-DUSE_EX3D - -DMIXER=0 - -DUAC2_MODE=1 - #-ldnr_50ms - #-llib_ex3d_all - #-DEQ_EN=1 - #-DEX3D_SF_NUM=3 - -DNUM_USB_CHAN_OUT=2 - -DNUM_USB_CHAN_IN=0 - #-DNUM_EX3D_CHAN_OUT=2 - -DMIN_VOLUME=0xE000 - -DINPUT_VOLUME_CONTROL=0 - -DOUTPUT_VOLUME_CONTROL=0 - -DDEBUG_MEMORY_LOG_ENABLED=1 - -DHID_DFU_EN=1 - -DXUA_DFU_EN=1 - #-DIR_SWITCHING_MODE - -DHID_CONTROLS=1) +#set(APP_COMPILER_FLAGS_f1_music_uac2 ${SW_USB_AUDIO_FLAGS} -DI2S_CHANS_DAC=2 +# -DI2S_CHANS_ADC=2 +# -DMIN_FREQ=44100 +# -DMAX_FREQ=192000 +# -DF1_MUSIC_UAC2=1 +# -DSTREAM_FORMAT_OUTPUT_1_RESOLUTION_BITS=24 +# -DSTREAM_FORMAT_OUTPUT_2_RESOLUTION_BITS=24 +# -DSTREAM_FORMAT_INPUT_1_RESOLUTION_BITS=24 +# -DSTREAM_FORMAT_INPUT_2_RESOLUTION_BITS=24 +# -DINPUT_FORMAT_COUNT=1 +# -DOUTPUT_FORMAT_COUNT=1 +# #-DUSE_EX3D +# -DMIXER=0 +# -DUAC2_MODE=1 +# #-ldnr_50ms +# #-llib_ex3d_all +# -DEQ_EN=1 +# #-DEX3D_SF_NUM=3 +# -DNUM_USB_CHAN_OUT=2 +# -DNUM_USB_CHAN_IN=2 +# #-DNUM_EX3D_CHAN_OUT=2 +# -DMIN_VOLUME=0xE000 +# -DINPUT_VOLUME_CONTROL=1 +# -DOUTPUT_VOLUME_CONTROL=1 +# #-DDEBUG_MEMORY_LOG_ENABLED=1 +# -DXUA_DFU_EN=1 +# -DHID_DFU_EN=1 +# #-DIR_SWITCHING_MODE +# -DHID_CONTROLS=1) - -set(APP_COMPILER_FLAGS_f1_music_uac2 ${SW_USB_AUDIO_FLAGS} -DI2S_CHANS_DAC=2 - -DI2S_CHANS_ADC=2 - -DMIN_FREQ=44100 - -DMAX_FREQ=192000 - -DF1_MUSIC_UAC2=1 - -DSTREAM_FORMAT_OUTPUT_1_RESOLUTION_BITS=24 - -DSTREAM_FORMAT_OUTPUT_2_RESOLUTION_BITS=24 - -DSTREAM_FORMAT_INPUT_1_RESOLUTION_BITS=24 - -DSTREAM_FORMAT_INPUT_2_RESOLUTION_BITS=24 - -DINPUT_FORMAT_COUNT=1 - -DOUTPUT_FORMAT_COUNT=1 - #-DUSE_EX3D - -DMIXER=0 - -DUAC2_MODE=1 - #-ldnr_50ms - #-llib_ex3d_all - -DEQ_EN=1 - #-DEX3D_SF_NUM=3 - -DNUM_USB_CHAN_OUT=2 - -DNUM_USB_CHAN_IN=2 - #-DNUM_EX3D_CHAN_OUT=2 - -DMIN_VOLUME=0xE000 - -DINPUT_VOLUME_CONTROL=1 - -DOUTPUT_VOLUME_CONTROL=1 - #-DDEBUG_MEMORY_LOG_ENABLED=1 - -DXUA_DFU_EN=1 - -DHID_DFU_EN=1 - #-DIR_SWITCHING_MODE - -DHID_CONTROLS=1) - - -set(APP_COMPILER_FLAGS_f3_f4_fps_uac2 ${SW_USB_AUDIO_FLAGS} -DI2S_CHANS_DAC=2 +set(APP_COMPILER_FLAGS_f3_fps_uac2 ${SW_USB_AUDIO_FLAGS} -DI2S_CHANS_DAC=2 -DI2S_CHANS_ADC=2 -DMIN_FREQ=48000 -DMAX_FREQ=48000 @@ -177,7 +177,7 @@ set(APP_COMPILER_FLAGS_f3_f4_fps_uac2 ${SW_USB_AUDIO_FLAGS} -DI2S_CHANS_DAC=2 -DMIXER=0 -DUAC2_MODE=1 -ldnr_50ms - -llib_ex3d_all + -llib_ex3d_game -DEQ_EN=1 -DDNR_ENABLE=1 -DSTREAM_FORMAT_OUTPUT_1_RESOLUTION_BITS=16 @@ -194,42 +194,72 @@ set(APP_COMPILER_FLAGS_f3_f4_fps_uac2 ${SW_USB_AUDIO_FLAGS} -DI2S_CHANS_DAC=2 #-DDEBUG_MEMORY_LOG_ENABLED=1 -DXUA_DFU_EN=1 -DHID_DFU_EN=1 - -DIR_SWITCHING_MODE + -DSPATIAL_GAME -DHID_CONTROLS=1) -set(APP_COMPILER_FLAGS_f6_f7_fps_uac1 ${SW_USB_AUDIO_FLAGS} -DI2S_CHANS_DAC=2 +set(APP_COMPILER_FLAGS_f4_fps_uac2 ${SW_USB_AUDIO_FLAGS} -DI2S_CHANS_DAC=2 -DI2S_CHANS_ADC=2 - -DAUDIO_CLASS=1 -DMIN_FREQ=48000 -DMAX_FREQ=48000 - -DMCLK_441=512*44100 - -DMCLK_48=512*48000 + -DUSE_EX3D=1 + -DF3_F4_FPS_UAC2=1 + -DMIXER=0 + -DUAC2_MODE=1 + -ldnr_50ms + -llib_ex3d_movie + -DEQ_EN=1 + -DDNR_ENABLE=1 -DSTREAM_FORMAT_OUTPUT_1_RESOLUTION_BITS=16 -DSTREAM_FORMAT_INPUT_1_RESOLUTION_BITS=16 -DINPUT_FORMAT_COUNT=1 -DOUTPUT_FORMAT_COUNT=1 - -DUAC1_MODE=1 - -DUSE_EX3D=1 - -DF6_F7_FPS_UAC1=1 - -DMIXER=0 - -ldnr_50ms - -DDNR_ENABLE=1 - -llib_ex3d_all - -DEQ_EN=1 -DEX3D_SF_NUM=3 -DNUM_USB_CHAN_OUT=8 -DNUM_USB_CHAN_IN=2 -DNUM_EX3D_CHAN_OUT=2 -DMIN_VOLUME=0xE000 - -DINPUT_VOLUME_CONTROL=0 - -DOUTPUT_VOLUME_CONTROL=0 + -DINPUT_VOLUME_CONTROL=1 + -DOUTPUT_VOLUME_CONTROL=1 #-DDEBUG_MEMORY_LOG_ENABLED=1 -DXUA_DFU_EN=1 -DHID_DFU_EN=1 - -DHID_CONTROLS_UAC1=1 - -DIR_SWITCHING_MODE + -DSPATIAL_MOVIE -DHID_CONTROLS=1) + +#set(APP_COMPILER_FLAGS_f6_f7_fps_uac1 ${SW_USB_AUDIO_FLAGS} -DI2S_CHANS_DAC=2 +# -DI2S_CHANS_ADC=2 +# -DAUDIO_CLASS=1 +# -DMIN_FREQ=48000 +# -DMAX_FREQ=48000 +# -DMCLK_441=512*44100 +# -DMCLK_48=512*48000 +# -DSTREAM_FORMAT_OUTPUT_1_RESOLUTION_BITS=16 +# -DSTREAM_FORMAT_INPUT_1_RESOLUTION_BITS=16 +# -DINPUT_FORMAT_COUNT=1 +# -DOUTPUT_FORMAT_COUNT=1 +# -DUAC1_MODE=1 +# -DUSE_EX3D=1 +# -DF6_F7_FPS_UAC1=1 +# -DMIXER=0 +# -ldnr_50ms +# -DDNR_ENABLE=1 +# -llib_ex3d_all +# -DEQ_EN=1 +# -DEX3D_SF_NUM=3 +# -DNUM_USB_CHAN_OUT=8 +# -DNUM_USB_CHAN_IN=2 +# -DNUM_EX3D_CHAN_OUT=2 +# -DMIN_VOLUME=0xE000 +# -DINPUT_VOLUME_CONTROL=0 +# -DOUTPUT_VOLUME_CONTROL=0 +# #-DDEBUG_MEMORY_LOG_ENABLED=1 +# -DXUA_DFU_EN=1 +# -DHID_DFU_EN=1 +# -DHID_CONTROLS_UAC1=1 +# -DIR_SWITCHING_MODE +# -DHID_CONTROLS=1) + set(APP_INCLUDES src src/core src/extensions ../../lib_dnr/lib_dnr) set(XMOS_SANDBOX_DIR ${CMAKE_CURRENT_LIST_DIR}/../..) diff --git a/sw_usb_audio/app_usb_aud_phaten_golden_6ch/src/extensions/dsp.c b/sw_usb_audio/app_usb_aud_phaten_golden_6ch/src/extensions/dsp.c index e0d2616..decad4a 100644 --- a/sw_usb_audio/app_usb_aud_phaten_golden_6ch/src/extensions/dsp.c +++ b/sw_usb_audio/app_usb_aud_phaten_golden_6ch/src/extensions/dsp.c @@ -229,55 +229,6 @@ void UserBufferManagement(unsigned sampsFromUsbToAudio[], unsigned sampsFromAudi #endif } -#if defined(SPATIAL_DRAMA) || defined(SPATIAL_GAME) || defined(SPATIAL_MOVIE) || defined(SPATIAL_MUSIC) || defined(IR_SWITCHING_MODE) - // 6ch version - // C and LFE -3dB mixed to L and R. - // L = L + C*-3dB + LFE*-3dB - // R = R + C*-3dB + LFE*-3dB - - int32_t input_L = (int32_t)sampsFromUsbToAudio[0]; - int32_t input_R = (int32_t)sampsFromUsbToAudio[1]; - int32_t input_C = (int32_t)sampsFromUsbToAudio[2]; - int32_t input_LFE = (int32_t)sampsFromUsbToAudio[3]; - - // -3dB Gain = 10^(-3/20) ~= 0.707946 - // Using 0.70710678 (1/sqrt(2)) approximation for -3dB - // Q31 factor: 0.70710678 * 2^31 = 1518500250 - const int32_t gain_minus_3db = 1518500250; - - int32_t C_weighted = (int32_t)(((int64_t)input_C * gain_minus_3db) >> 31); - int32_t LFE_weighted = (int32_t)(((int64_t)input_LFE * gain_minus_3db) >> 31); - - int64_t sum_L = (int64_t)input_L + C_weighted + LFE_weighted; - int64_t sum_R = (int64_t)input_R + C_weighted + LFE_weighted; - - // Saturation logic - if (sum_L > 2147483647) sum_L = 2147483647; - else if (sum_L < -2147483648) sum_L = -2147483648; - - if (sum_R > 2147483647) sum_R = 2147483647; - else if (sum_R < -2147483648) sum_R = -2147483648; - - // only for Stereo game, Stereo music and Stereo movie mode - if ((is_3d > IR_OFF) && (is_3d < IR_7_1_GAME)) { - // stereo mode - ubm_egress[0][frame_index] = 0; - ubm_egress[1][frame_index] = 0; - ubm_egress[2][frame_index] = 0; - ubm_egress[3][frame_index] = 0; - ubm_egress[4][frame_index] = 0; - ubm_egress[5][frame_index] = 0; - ubm_egress[6][frame_index] = (int32_t)sum_L; //SL - ubm_egress[7][frame_index] = (int32_t)sum_R; //SR - } else { - ubm_egress[0][frame_index] = (int32_t)sum_L; - ubm_egress[1][frame_index] = (int32_t)sum_R; - } - - // Zero out C (2) and LFE (3) since they are mixed into L/R - ubm_egress[2][frame_index] = 0; - ubm_egress[3][frame_index] = 0; -#endif for(int ch=0;ch= 0 && sfIdx < 3) { - unsigned cur_mode; - GET_SHARED_GLOBAL(cur_mode, g_3d_on_off_t1); - - last_sf_idx_0_2 = (unsigned)sfIdx; - - if (cur_mode == IR_OFF) { - // 改动原因：算法已关闭时不写 g_3d_on_off_t1，避免 event_polling 误判“主机改变声场”而自动打开算法 - debug_printf("algorithm OFF, cache sound field idx=%d only (no implicit on/off)\n", sfIdx); - } else { - // 改动原因：算法已开启时才更新声场；因EX3D_SF_NUM=3不再区分6个族 - unsigned new_mode; - if (sfIdx == 1) new_mode = IR_7_1_GAME; - else if (sfIdx == 2) new_mode = IR_7_1_MOVIE; - else new_mode = IR_GAME; - SET_SHARED_GLOBAL(g_3d_on_off_t1, new_mode); - debug_printf("set sound field idx=%d -> g_3d_on_off_t1=%d (no implicit on/off)\n", sfIdx, new_mode); - } - } else { - // 改动原因：EX3D_SF_NUM=3后只支持0~2，超过范围返回错误 + if (sfIdx < EX3D_SF_NUM) { + audio_ex3d_set_sf(sfIdx); + } else pSendBuf[idx] = 0xFFFFFFFF; - } } else { // Get - // 改动原因：返回当前声场索引(0~2: GAME/MUSIC/MOVIE)；若算法OFF则返回缓存值，避免依赖 g_3d_on_off_t1=IR_OFF - unsigned cur_mode; - GET_SHARED_GLOBAL(cur_mode, g_3d_on_off_t1); - if (cur_mode == IR_OFF) { - pSendBuf[idx] = last_sf_idx_0_2; - } else if (cur_mode == IR_7_1_MOVIE) { - pSendBuf[idx] = 2; - } else if (cur_mode == IR_7_1_GAME) { - pSendBuf[idx] = 1; - } else { - pSendBuf[idx] = 0; - } + pSendBuf[idx] = 0;//EX3D_SF_Idx; } break; @@ -948,30 +843,16 @@ void hid_button_task(chanend_t cc_mic_level, chanend_t c_hidRcvData, chanend_t c if ((current_mode_local == 0) || (current_mode_local == 1)) { // 无音效模式：关闭EX3D和EQ算法 audio_ex3d_set_onoff(0); - is_3d_on = IR_OFF; debug_printf("Mode 0: EX3D+EQ OFF\n"); } else if (current_mode_local == 2) { // 音乐模式：EX3D关闭，EQ开启 -#if (MODE_F3_F4_FPS_UAC2 == 1) audio_ex3d_set_onoff(1); - is_3d_on = IR_GAME; -#endif -#if (MODE_F6_F7_FPS_UAC1 == 1) - audio_ex3d_set_onoff(0); - is_3d_on = IR_OFF; -#endif } else if (current_mode_local == 3) { -#if (MODE_F3_F4_FPS_UAC2 == 1) + audio_ex3d_set_onoff(1); - is_3d_on = IR_7_1_GAME; -#endif -#if (MODE_F6_F7_FPS_UAC1 == 1) - audio_ex3d_set_onoff(1); - is_3d_on = IR_GAME; -#endif + } #endif - } else if (tmp == 0xFD) { // 脚步增强按键发来的 expand gain 命令 // 必须先读取payload，无论是否启用EX3D @@ -1107,37 +988,7 @@ void hid_button_task(chanend_t cc_mic_level, chanend_t c_hidRcvData, chanend_t c hwtimer_set_trigger_time(timer, hwtimer_get_time(timer) + KEY_POLLING_INTERVAL); #if USE_EX3D == 1 - // 检查 host app 是否通过 HID 改变了音场状态 - uint32_t host_app_sf; - GET_SHARED_GLOBAL(host_app_sf, g_3d_on_off_t1); - if (host_app_sf != is_3d_on) { - is_3d_on = host_app_sf; - - // Select SF and set on/off together - if (is_3d_on == IR_OFF) { - audio_ex3d_set_onoff(0); - current_mode_local = 0; - debug_printf("3d off\n"); - } else if (is_3d_on == IR_GAME) { - audio_ex3d_set_sf(0); - audio_ex3d_set_onoff(1); - current_mode_local = 1; - debug_printf("Stereo Game on (sf=0)\n"); - } else if (is_3d_on == IR_7_1_GAME) { - audio_ex3d_set_sf(1); - audio_ex3d_set_onoff(1); - current_mode_local = 2; - debug_printf("3d Game on (sf=1)\n"); - } else if (is_3d_on == IR_7_1_MOVIE) { - audio_ex3d_set_sf(2); - audio_ex3d_set_onoff(1); - current_mode_local = 3; - debug_printf("3d Movie on (sf=2)\n"); - } else { - audio_ex3d_set_onoff(is_3d_on != IR_OFF); - } - SET_SHARED_GLOBAL(g_3d_on_off_t1, is_3d_on); - } + #endif } continue; @@ -1219,25 +1070,15 @@ void ex3d_task(){ #define TD_DATA_BUFFER_ELEMENTS SPATIAL_STEREO_2K_v090h090_left_DATA_BUFFER_ELEMENTS #elif defined(STEREO_8K) #define TD_DATA_BUFFER_ELEMENTS SPATIAL_STEREO_8K_v090h090_left_DATA_BUFFER_ELEMENTS -#elif defined(IR_SWITCHING_MODE) -#define TD_DATA_BUFFER_ELEMENTS SPATIAL_71_GAME_v090h225_left_DATA_BUFFER_ELEMENTS #else #error you need to define SPATIAL_DRAMA or STEREO_8K.... #endif -#if defined (IR_SWITCHING_MODE) -int dsp_worker(chanend_t c_dsp_to_ex3d, - td_block_fir_filter_t * filters[DSP_WORKER_FILTER_PER_DATA_CH*DSP_WORKER_DATA_CH_COUNT*4]){ -#else int dsp_worker(chanend_t c_dsp_to_ex3d, td_block_fir_filter_t * filters[DSP_WORKER_FILTER_PER_DATA_CH*DSP_WORKER_DATA_CH_COUNT]){ -#endif + int32_t sample_buffer[DSP_WORKER_DATA_CH_COUNT][TD_DATA_BUFFER_ELEMENTS]; td_block_fir_data_t fir_data[DSP_WORKER_DATA_CH_COUNT]; -#if defined (IR_SWITCHING_MODE) - static uint32_t ir_mode; - GET_SHARED_GLOBAL(ir_mode, g_3d_on_off_t1); -#endif for(int i=0;i 3) { - ir_mode -= 4; - } else { - ir_mode -= 1; - } - } for(int ch=0;ch