Small settings update

Author: sh123

codec2talkie/src/main/java/com/radio/codec2talkie/protocol/AudioOpus.java

@@ -44,7 +44,7 @@ public void initialize(Transport transport, Context context, ProtocolCallback pr
         SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(context);
         int bitRate = Integer.parseInt(sharedPreferences.getString(PreferenceKeys.OPUS_BIT_RATE, "3200"));
         int complexity = Integer.parseInt(sharedPreferences.getString(PreferenceKeys.OPUS_COMPLEXITY, "5"));
-        float pcmFrameDuration = Float.parseFloat(sharedPreferences.getString(PreferenceKeys.OPUS_FRAME_SIZE, "40"));
+        float pcmFrameDuration = Float.parseFloat(sharedPreferences.getString(PreferenceKeys.OPUS_FRAME_SIZE, "20"));
 
         _pcmFrameSize = (int)(SAMPLE_RATE / 1000 * pcmFrameDuration);
         _audioBufferSize = 10*_pcmFrameSize;

codec2talkie/src/main/res/values/arrays.xml

@@ -450,9 +450,9 @@
         <item>FreeDV 700C</item>
         <item>FreeDV 700D</item>
         <item>FreeDV 700E</item>
-        <item>FreeDV 2020</item>
+        <!--item>FreeDV 2020</item>
         <item>FreeDV 2020B</item>
-        <item>FreeDV 2020C</item>
+        <item>FreeDV 2020C</item-->
     </string-array>
 
     <string-array name="ports_sound_modem_type_values">
@@ -465,9 +465,9 @@
         <item>F6</item>
         <item>F7</item>
         <item>F13</item>
-        <item>F8</item>
+        <!--item>F8</item>
         <item>F16</item>
-        <item>F17</item>
+        <item>F17</item-->
     </string-array>
 
     <string-array name="ports_type_labels">
@@ -579,21 +579,15 @@
     </string-array>
 
     <string-array name="ports_sound_modem_freedv_data_mode_entries">
-        <item>FSK LDPC</item>
-        <item>DATAC1 980bps (FWD)</item>
-        <item>DATAC3 321bps (FWD)</item>
-        <item>DATAC0 291bps (ACK)</item>
-        <item>DATAC4 87bps (FWD)</item>
-        <item>DATAC13 64bps (ACK)</item>
+        <item>DATAC1 980bps</item>
+        <item>DATAC3 321bps</item>
+        <item>DATAC4 87bps</item>
     </string-array>
 
     <string-array name="ports_sound_modem_freedv_data_mode_values">
-        <item>9</item>
         <item>10</item>
         <item>12</item>
-        <item>14</item>
         <item>18</item>
-        <item>19</item>
     </string-array>
 
     <string-array name="ports_sound_modem_audio_source_entries">

codec2talkie/src/main/res/values/strings.xml

@@ -27,8 +27,8 @@
 
     <string name="opus_category_title">OPUS Settings</string>
     <string name="opus_frame_size_title">PCM frame duration [ms]</string>
-    <string name="opus_bit_rate_title">Bit rate</string>
-    <string name="opus_bit_rate_summary">Bit rate from 2400 up to 512000bps, set larger frame duration below for smaller bit rates</string>
+    <string name="opus_bit_rate_title">Bit rate [bps]</string>
+    <string name="opus_bit_rate_summary">Bit rate from 1200 up to 16000bps (practical), set PCM frame duration to 20ms for lower bit rates</string>
     <string name="opus_complexity_title">Complexity</string>
 
     <string name="main_status_loopback_test">Loopback</string>

libopus-android/src/main/cpp/OpusJNI.cpp

@@ -28,6 +28,7 @@ namespace Java_com_radio_opus_Opus {
             opus_encoder_ctl(encoder, OPUS_SET_BITRATE(bitrate));
             opus_encoder_ctl(encoder, OPUS_SET_COMPLEXITY(complexity));
             opus_encoder_ctl(encoder, OPUS_SET_SIGNAL(OPUS_SIGNAL_VOICE));
+            opus_encoder_ctl(encoder, OPUS_SET_BANDWIDTH(OPUS_BANDWIDTH_NARROWBAND));
         }
 
         int decoderError;