From 396faec2366d1874c23c2bbd5f9fb8e4a95dc445 Mon Sep 17 00:00:00 2001 From: Doug McLain Date: Sun, 22 Oct 2023 16:21:39 -0400 Subject: [PATCH] Fix for Android 14 and some code cleanups --- DroidStar.pro | 4 ++-- android/src/main/java/USBSerialWrapper.java | 2 +- imbe_vocoder/pitch_est.cc | 3 +-- imbe_vocoder/v_uv_det.cc | 9 +++------ 4 files changed, 7 insertions(+), 11 deletions(-) diff --git a/DroidStar.pro b/DroidStar.pro index 67f3791..e87e975 100644 --- a/DroidStar.pro +++ b/DroidStar.pro @@ -9,13 +9,13 @@ CONFIG += c++17 LFLAGS += !win32:LIBS += -ldl win32:QT += serialport -#win32:LIBS += -lws2_32 +win32:LIBS += -lws2_32 win32:QMAKE_LFLAGS += -static QMAKE_LFLAGS_WINDOWS += --enable-stdcall-fixup RC_ICONS = images/droidstar.ico ICON = images/droidstar.icns 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 ios:LIBS += -framework AVFoundation ios:QMAKE_IOS_DEPLOYMENT_TARGET=14.0 diff --git a/android/src/main/java/USBSerialWrapper.java b/android/src/main/java/USBSerialWrapper.java index 4da5f98..20a79c7 100644 --- a/android/src/main/java/USBSerialWrapper.java +++ b/android/src/main/java/USBSerialWrapper.java @@ -142,7 +142,7 @@ public class USBSerialWrapper implements SerialInputOutputManagerTest.Listener { 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; } diff --git a/imbe_vocoder/pitch_est.cc b/imbe_vocoder/pitch_est.cc index dba94d5..f0f4bf1 100644 --- a/imbe_vocoder/pitch_est.cc +++ b/imbe_vocoder/pitch_est.cc @@ -192,7 +192,7 @@ void imbe_vocoder_impl::pitch_est(IMBE_PARAM *imbe_param, Word16 *frames_buf) UWord16 tmp=0, p_fp; UWord32 UL_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]; // 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; cef_est = e_p_arr0[p0] + e_p_arr1[p0] + e_p_arr2[p0]; - e1p1_e2p2 = 1; p1 = 0; while(p1 < 203) diff --git a/imbe_vocoder/v_uv_det.cc b/imbe_vocoder/v_uv_det.cc index bf721cf..7e47d0f 100644 --- a/imbe_vocoder/v_uv_det.cc +++ b/imbe_vocoder/v_uv_det.cc @@ -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; 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; - 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 band_cnt, num_harms_cnt, uv_harms_cnt, Dk; 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; @@ -182,8 +182,7 @@ void imbe_vocoder_impl::v_uv_det(IMBE_PARAM *imbe_param, Cmplx16 *fft_buf) uv_harms_cnt = 0; b1_vec = 0; band_cnt = 0; - num_harms_cnt = 0; - Sw_sum = 0; + num_harms_cnt = 0; D_num = D_den = 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)))); fund_fr_acc = L_add(fund_fr_acc, fund_fr_step); - - thr[band_cnt] = dsn_thr; } // ====================================================