forks/DroidStar
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix for Android 14 and some code cleanups

Browse source
This commit is contained in:
Doug McLain 2023-10-22 16:21:39 -04:00
parent f0a60f3134
commit 396faec236
4 changed files with 7 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
DroidStar.pro
View file

@ -9,13 +9,13 @@ CONFIG += c++17
LFLAGS += LFLAGS +=
!win32:LIBS += -ldl !win32:LIBS += -ldl
win32:QT += serialport win32:QT += serialport
#win32:LIBS += -lws2_32 win32:LIBS += -lws2_32
win32:QMAKE_LFLAGS += -static win32:QMAKE_LFLAGS += -static
QMAKE_LFLAGS_WINDOWS += --enable-stdcall-fixup QMAKE_LFLAGS_WINDOWS += --enable-stdcall-fixup
RC_ICONS = images/droidstar.ico RC_ICONS = images/droidstar.ico
ICON = images/droidstar.icns ICON = images/droidstar.icns
macx:LIBS += -framework AVFoundation macx:LIBS += -framework AVFoundation
macx:QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.14 macx:QMAKE_MACOSX_DEPLOYMENT_TARGET = 12.0
macx:QMAKE_INFO_PLIST = Info.plist.mac macx:QMAKE_INFO_PLIST = Info.plist.mac
ios:LIBS += -framework AVFoundation ios:LIBS += -framework AVFoundation
ios:QMAKE_IOS_DEPLOYMENT_TARGET=14.0 ios:QMAKE_IOS_DEPLOYMENT_TARGET=14.0

2
android/src/main/java/USBSerialWrapper.java
View file

@ -142,7 +142,7 @@ public class USBSerialWrapper implements SerialInputOutputManagerTest.Listener {
System.out.println("USB device getVendorId() == " + availableDrivers.get(i).getDevice().getVendorId()); System.out.println("USB device getVendorId() == " + availableDrivers.get(i).getDevice().getVendorId());
} }
} }
c.registerReceiver(m_usbReceiver, m_filter); c.registerReceiver(m_usbReceiver, m_filter, Context.RECEIVER_EXPORTED);
return devices; return devices;
} }

3
imbe_vocoder/pitch_est.cc
View file

@ -192,7 +192,7 @@ void imbe_vocoder_impl::pitch_est(IMBE_PARAM *imbe_param, Word16 *frames_buf)
UWord16 tmp=0, p_fp; UWord16 tmp=0, p_fp;
UWord32 UL_tmp; UWord32 UL_tmp;
Word16 e_p_cur, pb, pf, ceb, s_tmp; Word16 e_p_cur, pb, pf, ceb, s_tmp;
Word16 cef_est, cef, p0_est, p0, p1, p2, p1_max_index, p2_max_index, e1p1_e2p2_est, e1p1_e2p2; Word16 cef_est, cef, p0_est, p0, p1, p2, p1_max_index, p2_max_index, e1p1_e2p2_est;
Word16 e_p_arr2_min[203]; Word16 e_p_arr2_min[203];
// Calculate E(p) function for current and two future frames // Calculate E(p) function for current and two future frames
@ -232,7 +232,6 @@ void imbe_vocoder_impl::pitch_est(IMBE_PARAM *imbe_param, Word16 *frames_buf)
p0_est = p0 = 0; p0_est = p0 = 0;
cef_est = e_p_arr0[p0] + e_p_arr1[p0] + e_p_arr2[p0]; cef_est = e_p_arr0[p0] + e_p_arr1[p0] + e_p_arr2[p0];
e1p1_e2p2 = 1;
p1 = 0; p1 = 0;
while(p1 < 203) while(p1 < 203)

9
imbe_vocoder/v_uv_det.cc
View file

@ -105,11 +105,11 @@ void imbe_vocoder_impl::v_uv_det(IMBE_PARAM *imbe_param, Cmplx16 *fft_buf)
Word16 i, j, index_a_save, tmp, index_wr; Word16 i, j, index_a_save, tmp, index_wr;
Word32 fund_freq, fund_freq_2, fund_freq_acc_a, fund_freq_acc_b, fund_freq_acc, fund_fr_acc, L_tmp, amp_re_acc, amp_im_acc; Word32 fund_freq, fund_freq_2, fund_freq_acc_a, fund_freq_acc_b, fund_freq_acc, fund_fr_acc, L_tmp, amp_re_acc, amp_im_acc;
Word16 ha, hb, index_a, index_b, index_tbl[30], it_ind, re_tmp, im_tmp, re_tmp2, im_tmp2, sc_coef; Word16 ha, hb, index_a, index_b, index_tbl[30], it_ind, re_tmp, im_tmp, re_tmp2, im_tmp2, sc_coef;
Word32 Sw_sum, M_num[NUM_HARMS_MAX], M_num_sum, M_den_sum, D_num, D_den, th_lf, th_hf, th0, fund_fr_step, M_fcn_num, M_fcn_den; Word32 M_num[NUM_HARMS_MAX], M_num_sum, M_den_sum, D_num, D_den, th_lf, th_hf, th0, fund_fr_step, M_fcn_num, M_fcn_den;
Word16 sp_rec_re, sp_rec_im, M_fcn; Word16 sp_rec_re, sp_rec_im, M_fcn;
Word16 band_cnt, num_harms_cnt, uv_harms_cnt, Dk; Word16 band_cnt, num_harms_cnt, uv_harms_cnt, Dk;
Word16 num_harms, num_bands, dsn_thr=0; Word16 num_harms, num_bands, dsn_thr=0;
Word16 thr[NUM_BANDS_MAX], M_den[NUM_HARMS_MAX], b1_vec; Word16 M_den[NUM_HARMS_MAX], b1_vec;
fund_freq = imbe_param->fund_freq; fund_freq = imbe_param->fund_freq;
@ -182,8 +182,7 @@ void imbe_vocoder_impl::v_uv_det(IMBE_PARAM *imbe_param, Cmplx16 *fft_buf)
uv_harms_cnt = 0; uv_harms_cnt = 0;
b1_vec = 0; b1_vec = 0;
band_cnt = 0; band_cnt = 0;
num_harms_cnt = 0; num_harms_cnt = 0;
Sw_sum = 0;
D_num = D_den = 0; D_num = D_den = 0;
fund_fr_acc = 0; fund_fr_acc = 0;
@ -217,8 +216,6 @@ void imbe_vocoder_impl::v_uv_det(IMBE_PARAM *imbe_param, Cmplx16 *fft_buf)
dsn_thr = mult(M_fcn, sub(CNST_0_45_Q1_15, mult(CNST_0_1393_Q1_15, extract_h(fund_fr_acc)))); dsn_thr = mult(M_fcn, sub(CNST_0_45_Q1_15, mult(CNST_0_1393_Q1_15, extract_h(fund_fr_acc))));
fund_fr_acc = L_add(fund_fr_acc, fund_fr_step); fund_fr_acc = L_add(fund_fr_acc, fund_fr_step);
thr[band_cnt] = dsn_thr;
} }
// ==================================================== // ====================================================