From f5ce9e7bbdcd386777fec05743124230e7b31fe0 Mon Sep 17 00:00:00 2001
From: sh123 <sh123@users.noreply.github.com>
Date: Sat, 9 Dec 2023 17:21:50 +0200
Subject: [PATCH] Add opus preferences

---
 .../codec2talkie/settings/PreferenceKeys.java |  7 ++-
 .../settings/SettingsActivity.java            | 12 ++++-
 codec2talkie/src/main/res/values/arrays.xml   | 12 +++++
 codec2talkie/src/main/res/values/strings.xml  | 14 +++++-
 codec2talkie/src/main/res/xml/preferences.xml | 26 +++++-----
 .../src/main/res/xml/preferences_codec.xml    | 49 +++++++++++++++++++
 6 files changed, 103 insertions(+), 17 deletions(-)
 create mode 100644 codec2talkie/src/main/res/xml/preferences_codec.xml

diff --git a/codec2talkie/src/main/java/com/radio/codec2talkie/settings/PreferenceKeys.java b/codec2talkie/src/main/java/com/radio/codec2talkie/settings/PreferenceKeys.java
index f2bf3cf..57634ae 100644
--- a/codec2talkie/src/main/java/com/radio/codec2talkie/settings/PreferenceKeys.java
+++ b/codec2talkie/src/main/java/com/radio/codec2talkie/settings/PreferenceKeys.java
@@ -30,10 +30,15 @@ public final class PreferenceKeys {
     public static String PORTS_SOUND_MODEM_FREEDV_SQUELCH_SNR="ports_sound_modem_freedv_squelch_snr";
     public static String PORTS_SOUND_MODEM_FREEDV_DATA_MODE="ports_sound_modem_freedv_data_mode";
 
-    public static String CODEC2_MODE = "codec2_mode";
+    public static String CODEC_TYPE = "codec_type";
     public static String CODEC2_RECORDING_ENABLED = "codec2_recording_enabled";
+
+    public static String CODEC2_MODE = "codec2_mode";
     public static String CODEC2_TX_FRAME_MAX_SIZE = "codec2_tx_frame_max_size";
 
+    public static String OPUS_BIT_RATE = "opus_bit_rate";
+    public static String OPUS_FRAME_SIZE = "opus_frame_size";
+
     public static String KISS_ENABLED = "kiss_enable";
     public static String KISS_BUFFERED_ENABLED = "kiss_buffered_enable";
     public static String KISS_PARROT = "kiss_parrot_enable";
diff --git a/codec2talkie/src/main/java/com/radio/codec2talkie/settings/SettingsActivity.java b/codec2talkie/src/main/java/com/radio/codec2talkie/settings/SettingsActivity.java
index 2f80adc..be5603b 100644
--- a/codec2talkie/src/main/java/com/radio/codec2talkie/settings/SettingsActivity.java
+++ b/codec2talkie/src/main/java/com/radio/codec2talkie/settings/SettingsActivity.java
@@ -39,7 +39,8 @@ public class SettingsActivity extends AppCompatActivity
             "ports_tcp_ip_retry_delay",
             "ports_sound_modem_preamble",
             "ports_sound_modem_ptt_off_delay_ms",
-            "aprs_is_tcpip_server_port"
+            "aprs_is_tcpip_server_port",
+            "opus_bit_rate"
     };
 
     private static final String[] _signedDecimalSettings = {
@@ -143,6 +144,15 @@ public class SettingsActivity extends AppCompatActivity
         }
     }
 
+    public static class SettingsCodecFragment extends PreferenceFragmentCompat
+    {
+        @Override
+        public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
+            setPreferencesFromResource(R.xml.preferences_codec, null);
+            setNumberInputType(getPreferenceManager());
+        }
+    }
+
     public static class SettingsAprsLocationFragment extends PreferenceFragmentCompat
     {
         @Override
diff --git a/codec2talkie/src/main/res/values/arrays.xml b/codec2talkie/src/main/res/values/arrays.xml
index bde7708..0550914 100644
--- a/codec2talkie/src/main/res/values/arrays.xml
+++ b/codec2talkie/src/main/res/values/arrays.xml
@@ -13,6 +13,11 @@
         <item>115200</item>
     </string-array>
 
+    <string-array name="codec_type_modes">
+        <item>Codec2</item>
+        <item>OPUS</item>
+    </string-array>
+
     <string-array name="codec2_modes">
         <item>MODE_450=10</item>
         <item>MODE_700C=8</item>
@@ -24,6 +29,13 @@
         <item>MODE_3200=0</item>
     </string-array>
 
+    <string-array name="opus_frame_size">
+        <item>20</item>
+        <item>40</item>
+        <item>80</item>
+        <item>180</item>
+    </string-array>
+
     <string-array name="lora_bandwidths">
         <item>7800</item>
         <item>10400</item>
diff --git a/codec2talkie/src/main/res/values/strings.xml b/codec2talkie/src/main/res/values/strings.xml
index f41b80b..759bc16 100644
--- a/codec2talkie/src/main/res/values/strings.xml
+++ b/codec2talkie/src/main/res/values/strings.xml
@@ -12,13 +12,23 @@
     <string name="usb_bt_client_name_title">Bluetooth device</string>
     <string name="usb_bt_client_name_summary">Default Bluetooth device to connect</string>
 
-    <string name="codec2_category_title">Codec2 settings</string>
+    <string name="codec_category_title">Audio Codec Settings</string>
+    <string name="codec_type_title">Select codec type</string>
+    <string name="codec_type_settings_title">Codec settings</string>
+    <string name="codec_type_settings_summary">Change selected codec settings, such as bit rate, frame size</string>
+
+    <string name="codec2_category_title">Codec2 Settings</string>
     <string name="codec2_mode_title">Mode/Speed</string>
     <string name="codec2_test_mode_title">Loopback test mode</string>
     <string name="codec2_test_mode_summary">Records and plays recording without transmission</string>
     <string name="codec2_recorder_title">Enable recorder</string>
     <string name="codec2_recorder_summary">Record incoming and outgoing transmissions for future playback</string>
 
+    <string name="opus_category_title">OPUS Settings</string>
+    <string name="opus_frame_size_title">Frame size</string>
+    <string name="opus_bit_rate_title">Bit rate</string>
+    <string name="opus_bit_rate_summary">Bit rate from 500 up to 512000bps</string>
+
     <string name="main_status_loopback_test">Loopback</string>
     <string name="main_status_stop">STOPPED</string>
     <string name="main_status_tx">TRANSMITTING</string>
@@ -102,7 +112,7 @@
     <string name="app_volume_ptt_title">Use volume keys for PTT</string>
     <string name="app_volume_ptt_summary">Volume up/down keys will be used for PTT</string>
 
-    <string name="app_category_title">Application settings</string>
+    <string name="app_category_title">Application Settings</string>
 
     <string name="app_keep_screen_on_title">Keep screen ON</string>
     <string name="app_keep_screen_on_summary">Prevent screen switching off when app is active</string>
diff --git a/codec2talkie/src/main/res/xml/preferences.xml b/codec2talkie/src/main/res/xml/preferences.xml
index f26a660..822db2a 100644
--- a/codec2talkie/src/main/res/xml/preferences.xml
+++ b/codec2talkie/src/main/res/xml/preferences.xml
@@ -115,24 +115,24 @@
     </PreferenceCategory>
 
     <PreferenceCategory
-        app:key="codec2_category"
-        app:title="@string/codec2_category_title">
+        app:key="codec_category"
+        app:title="@string/codec_category_title">
 
         <ListPreference
-            app:key="codec2_mode"
-            app:title="@string/codec2_mode_title"
-            app:entries="@array/codec2_modes"
-            app:entryValues="@array/codec2_modes"
-            app:defaultValue="MODE_450=10"
+            app:key="codec_type"
+            app:title="@string/codec_type_title"
+            app:entries="@array/codec_type_modes"
+            app:entryValues="@array/codec_type_modes"
+            app:defaultValue="Codec2"
             app:summary="%s">
         </ListPreference>
 
-        <EditTextPreference
-            app:key="codec2_tx_frame_max_size"
-            app:title="@string/codec2_tx_frame_max_size_title"
-            app:summary="@string/codec2_tx_frame_max_size_summary"
-            app:defaultValue="48">
-        </EditTextPreference>
+        <Preference
+            app:key="codec_type_settings"
+            app:title="@string/codec_type_settings_title"
+            app:summary="@string/codec_type_settings_summary"
+            app:fragment="com.radio.codec2talkie.settings.SettingsActivity$SettingsCodecFragment">
+        </Preference>
 
         <SwitchPreference
             app:key="codec2_recording_enabled"
diff --git a/codec2talkie/src/main/res/xml/preferences_codec.xml b/codec2talkie/src/main/res/xml/preferences_codec.xml
new file mode 100644
index 0000000..5f1f5a1
--- /dev/null
+++ b/codec2talkie/src/main/res/xml/preferences_codec.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="utf-8"?>
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <PreferenceCategory
+        app:key="codec2_category"
+        app:title="@string/codec2_category_title">
+
+        <ListPreference
+            app:key="codec2_mode"
+            app:title="@string/codec2_mode_title"
+            app:entries="@array/codec2_modes"
+            app:entryValues="@array/codec2_modes"
+            app:defaultValue="MODE_450=10"
+            app:summary="%s">
+        </ListPreference>
+
+        <EditTextPreference
+            app:key="codec2_tx_frame_max_size"
+            app:title="@string/codec2_tx_frame_max_size_title"
+            app:summary="@string/codec2_tx_frame_max_size_summary"
+            app:defaultValue="48">
+        </EditTextPreference>
+
+    </PreferenceCategory>
+
+    <PreferenceCategory
+        app:key="opus_category"
+        app:title="@string/opus_category_title">
+
+        <EditTextPreference
+            app:key="opus_bit_rate"
+            app:title="@string/opus_bit_rate_title"
+            app:summary="@string/opus_bit_rate_summary"
+            app:defaultValue="3200">
+        </EditTextPreference>
+
+        <ListPreference
+            app:key="opus_frame_size"
+            app:title="@string/opus_frame_size_title"
+            app:entries="@array/opus_frame_size"
+            app:entryValues="@array/opus_frame_size"
+            app:defaultValue="40"
+            app:summary="%s">
+        </ListPreference>
+
+    </PreferenceCategory>
+
+</PreferenceScreen>
\ No newline at end of file