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 ce2e1b5..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/._.DS_Store b/lib_ex3d/lib_ex3d/._.DS_Store deleted file mode 100644 index c1965ad..0000000 Binary files a/lib_ex3d/lib_ex3d/._.DS_Store and /dev/null differ diff --git a/lib_ex3d/lib_ex3d/._api b/lib_ex3d/lib_ex3d/._api deleted file mode 100644 index 743c693..0000000 Binary files a/lib_ex3d/lib_ex3d/._api and /dev/null differ diff --git a/lib_ex3d/lib_ex3d/._lib b/lib_ex3d/lib_ex3d/._lib deleted file mode 100644 index ba50a0d..0000000 Binary files a/lib_ex3d/lib_ex3d/._lib and /dev/null differ diff --git a/lib_ex3d/lib_ex3d/api/._.DS_Store b/lib_ex3d/lib_ex3d/api/._.DS_Store deleted file mode 100644 index aa2c934..0000000 Binary files a/lib_ex3d/lib_ex3d/api/._.DS_Store and /dev/null differ diff --git a/lib_ex3d/lib_ex3d/api/._DSAudioDef.h b/lib_ex3d/lib_ex3d/api/._DSAudioDef.h deleted file mode 100644 index 9148313..0000000 Binary files a/lib_ex3d/lib_ex3d/api/._DSAudioDef.h and /dev/null differ diff --git a/lib_ex3d/lib_ex3d/api/._DSBuild.h b/lib_ex3d/lib_ex3d/api/._DSBuild.h deleted file mode 100644 index 08aa37b..0000000 Binary files a/lib_ex3d/lib_ex3d/api/._DSBuild.h and /dev/null differ diff --git a/lib_ex3d/lib_ex3d/api/._IR.h b/lib_ex3d/lib_ex3d/api/._IR.h deleted file mode 100644 index 3f7b894..0000000 Binary files a/lib_ex3d/lib_ex3d/api/._IR.h and /dev/null differ diff --git a/lib_ex3d/lib_ex3d/api/._audio_ex3d_control.h b/lib_ex3d/lib_ex3d/api/._audio_ex3d_control.h deleted file mode 100644 index 684fede..0000000 Binary files a/lib_ex3d/lib_ex3d/api/._audio_ex3d_control.h and /dev/null differ diff --git a/lib_ex3d/lib_ex3d/api/._filter.h b/lib_ex3d/lib_ex3d/api/._filter.h deleted file mode 100644 index b4debb2..0000000 Binary files a/lib_ex3d/lib_ex3d/api/._filter.h and /dev/null differ diff --git a/lib_ex3d/lib_ex3d/api/audio_ex3d_control.h b/lib_ex3d/lib_ex3d/api/audio_ex3d_control.h index 92e4d61..38e7565 100644 --- a/lib_ex3d/lib_ex3d/api/audio_ex3d_control.h +++ b/lib_ex3d/lib_ex3d/api/audio_ex3d_control.h @@ -68,3 +68,9 @@ EXTERN uint8_t bEX3D_Upmix; // EX3D Upmix 유무 저장 EXTERN int32_t Ex3dLimiterThreshold; // EX3D Limiter threshold 값 EXTERN int32_t Ex3dLimiterAttackTime; // EX3D Limiter Attack Time 값 EXTERN int32_t Ex3dLimiterReleaseTime; // EX3D Limiter Release Time 값 + +// dhlee++ +EXTERN int32_t Ex3dExpandGain; // EX3D Expand Gain 값 +EXTERN int32_t Ex3dReduceGain; // EX3D Reduce Gain 값 + +// dhlee-- diff --git a/lib_ex3d/lib_ex3d/lib/._.DS_Store b/lib_ex3d/lib_ex3d/lib/._.DS_Store deleted file mode 100644 index ddc3c01..0000000 Binary files a/lib_ex3d/lib_ex3d/lib/._.DS_Store and /dev/null differ diff --git a/lib_ex3d/lib_ex3d/lib/liblib_ex3d_drama.a b/lib_ex3d/lib_ex3d/lib/liblib_ex3d_drama.a index 153e23b..4cf232f 100644 Binary files a/lib_ex3d/lib_ex3d/lib/liblib_ex3d_drama.a 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 index 2978e96..d561d72 100644 Binary files a/lib_ex3d/lib_ex3d/lib/liblib_ex3d_game.a 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 index a706cd6..4f868e1 100644 Binary files a/lib_ex3d/lib_ex3d/lib/liblib_ex3d_movie.a and b/lib_ex3d/lib_ex3d/lib/liblib_ex3d_movie.a differ diff --git a/lib_ex3d/lib_ex3d/lib/liblib_ex3d_music.a b/lib_ex3d/lib_ex3d/lib/liblib_ex3d_music.a index f677407..1c05cd8 100644 Binary files a/lib_ex3d/lib_ex3d/lib/liblib_ex3d_music.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 index 97c4196..1824e78 100644 Binary files a/lib_ex3d/lib_ex3d/lib/liblib_ex3d_stereo_2k.a 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 index 4bee7f5..743beea 100644 Binary files a/lib_ex3d/lib_ex3d/lib/liblib_ex3d_stereo_8k.a and b/lib_ex3d/lib_ex3d/lib/liblib_ex3d_stereo_8k.a differ diff --git a/sw_usb_audio/app_usb_aud_phaten_golden/src/extensions/dsp.c b/sw_usb_audio/app_usb_aud_phaten_golden/src/extensions/dsp.c index f1353b8..67c1772 100644 --- a/sw_usb_audio/app_usb_aud_phaten_golden/src/extensions/dsp.c +++ b/sw_usb_audio/app_usb_aud_phaten_golden/src/extensions/dsp.c @@ -200,9 +200,7 @@ void UserBufferManagement(unsigned sampsFromUsbToAudio[], unsigned sampsFromAudi chan_in_buf_word(uc_dsp_to_dnr_t1, (uint32_t *)(&ubm_micOut[0]), DSP_BLOCK_LENGTH); chan_in_buf_word(uc_dsp_to_dnr_t1, (uint32_t *)(&ubm_micOut[1]), DSP_BLOCK_LENGTH); #endif - } -#if EQ_EN - buffer_exchange(uc_eq_data, sampsFromUsbToAudio); + } buffer_exchange(uc_eq_data, sampsFromUsbToAudio); #endif sampsFromAudioToUsb[0] = sampsFromUsbToAudio[0]; sampsFromAudioToUsb[1] = sampsFromUsbToAudio[1]; @@ -232,6 +230,8 @@ typedef enum { CMD_TEST_CANCEL = 0x90, CMD_TEST_STEP = 0x91, CMD_TEST_ROTATE = 0x92, + CMD_EXPAND_GAIN = 0x93, // dhlee++ + CMD_REDUCE_GAIN = 0x94, // dhlee++ } PlbkCmdCode; #define CMD_SET(item) ((item) & ~0x0100) @@ -554,6 +554,43 @@ void hid_receive_task_in_c(unsigned char * RcvData, unsigned * SendData) } break; + // dhlee++ + + case CMD_EXPAND_GAIN: + if (CMD_SET(CMD_EXPAND_GAIN) == command_code) { + int32_t idBGain; + memcpy(&idBGain, &pRcvBuf[1], 4); + printf("Set CMD_EXPAND_GAIN : %d\r\n", idBGain); + if((0 <= idBGain) && (idBGain <= 20)) { + Ex3dExpandGain = idBGain; + EX3DAudio_SetExpandGain(Ex3dExpandGain); + } else { + pSendBuf[idx] = 0xFFFFFFFF; + } + } else { // Get + printf("Get CMD_EXPAND_GAIN : %d\r\n", Ex3dExpandGain); + memcpy(&pSendBuf[idx], &Ex3dExpandGain, 4); + } + break; + + case CMD_REDUCE_GAIN: + if (CMD_SET(CMD_REDUCE_GAIN) == command_code) { + int32_t idBGain; + memcpy(&idBGain, &pRcvBuf[1], 4); + printf("Set CMD_REDUCE_GAIN : %d\r\n", idBGain); + if((-20 <= idBGain) && (idBGain <= 0)) { + Ex3dReduceGain = idBGain; + EX3DAudio_SetReduceGain(Ex3dReduceGain); + } else { + pSendBuf[idx] = 0xFFFFFFFF; + } + } else { // Get + printf("Get CMD_REDUCE_GAIN : %d\r\n", Ex3dReduceGain); + memcpy(&pSendBuf[idx], &Ex3dReduceGain, 4); + } + break; + + default: break; }