New stream preferences

Author: omouren

app/src/main/AndroidManifest.xml

@@ -51,7 +51,7 @@
         </activity>
 
         <service
-            android:name=".StreamingService"
+            android:name=".streaming.StreamingService"
             android:foregroundServiceType="mediaProjection" />
 
         <meta-data

app/src/main/java/com/fpvout/digiview/MainActivity.java

@@ -36,6 +36,7 @@
 import androidx.core.content.res.ResourcesCompat;
 import androidx.preference.PreferenceManager;
 
+import com.fpvout.digiview.streaming.StreamingService;
 import com.google.android.material.floatingactionbutton.FloatingActionButton;
 
 import net.ossrs.rtmp.ConnectCheckerRtmp;
@@ -187,7 +188,7 @@ protected void onCreate(Bundle savedInstanceState) {
         liveButton = findViewById(R.id.liveButton);
         liveButton.setOnClickListener(v -> {
             if (!StreamingService.isStreaming()) {
-                if (sharedPreferences.getString("RtmpUrl", "").isEmpty() || sharedPreferences.getString("RtmpKey", "").isEmpty()) {
+                if (sharedPreferences.getString("StreamRtmpUrl", "").isEmpty() || sharedPreferences.getString("StreamRtmpKey", "").isEmpty()) {
                     Toast.makeText(this, getString(R.string.rtmp_settings_empty), Toast.LENGTH_LONG).show();
                     Intent intent = new Intent(v.getContext(), SettingsActivity.class);
                     v.getContext().startActivity(intent);

app/src/main/java/com/fpvout/digiview/SettingsActivity.java

@@ -10,6 +10,8 @@
 import androidx.preference.ListPreference;
 import androidx.preference.PreferenceFragmentCompat;
 
+import com.fpvout.digiview.streaming.StreamAudioSource;
+
 import java.util.ArrayList;
 import java.util.Arrays;
 
@@ -48,13 +50,16 @@ public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
             setPreferencesFromResource(R.xml.root_preferences, rootKey);
 
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
-                ListPreference audioSourcePreference = findPreference("AudioSource");
+                ListPreference audioSourcePreference = findPreference("StreamAudioSource");
 
                 ArrayList<CharSequence> entries = new ArrayList<>(Arrays.asList(audioSourcePreference.getEntries()));
                 ArrayList<CharSequence> entryValues = new ArrayList<>(Arrays.asList(audioSourcePreference.getEntryValues()));
 
-                entries.add(getString(R.string.audio_source_internal));
-                entryValues.add("internal");
+                entries.add(getString(R.string.stream_audio_source_performance));
+                entryValues.add(StreamAudioSource.PERFORMANCE);
+
+                entries.add(getString(R.string.stream_audio_source_internal));
+                entryValues.add(StreamAudioSource.INTERNAL);
 
                 audioSourcePreference.setEntries(entries.toArray(new CharSequence[0]));
                 audioSourcePreference.setEntryValues(entryValues.toArray(new CharSequence[0]));

app/src/main/java/com/fpvout/digiview/streaming/StreamAudioBitrate.java

@@ -0,0 +1,9 @@
+package com.fpvout.digiview.streaming;
+
+public class StreamAudioBitrate {
+    public static final String DEFAULT = "128";
+
+    public static int getBitrate(String value) {
+        return Integer.parseInt(value) * 1024;
+    }
+}

app/src/main/java/com/fpvout/digiview/streaming/StreamAudioSampleRate.java

@@ -0,0 +1,28 @@
+package com.fpvout.digiview.streaming;
+
+public class StreamAudioSampleRate {
+    public static final String DEFAULT = "44100hz";
+
+    public static int getSampleRate(String value) {
+        switch (value) {
+            case "8khz":
+                return 8000;
+            case "11025hz":
+                return 11025;
+            case "16khz":
+                return 16000;
+            case "22050hz":
+                return 22050;
+            case "32000hz":
+                return 32000;
+            case DEFAULT:
+                return 44100;
+            case "48khz":
+                return 48000;
+            case "96khz":
+                return 96000;
+        }
+
+        return -1;
+    }
+}

app/src/main/java/com/fpvout/digiview/streaming/StreamAudioSource.java

@@ -0,0 +1,26 @@
+package com.fpvout.digiview.streaming;
+
+import android.media.MediaRecorder;
+
+public class StreamAudioSource {
+    public static final String DEFAULT = "default";
+    public static final String INTERNAL = "internal";
+    public static final String PERFORMANCE = "performance";
+
+    public static int getAudioSource(String value) {
+        switch (value) {
+            case DEFAULT:
+                return MediaRecorder.AudioSource.DEFAULT;
+            case "mic":
+                return MediaRecorder.AudioSource.MIC;
+            case "cam":
+                return MediaRecorder.AudioSource.CAMCORDER;
+            case "communication":
+                return MediaRecorder.AudioSource.VOICE_COMMUNICATION;
+            case PERFORMANCE:
+                return MediaRecorder.AudioSource.VOICE_PERFORMANCE;
+        }
+
+        return -1;
+    }
+}

app/src/main/java/com/fpvout/digiview/streaming/StreamBitrate.java

@@ -0,0 +1,9 @@
+package com.fpvout.digiview.streaming;
+
+public class StreamBitrate {
+    public static final String DEFAULT = "2500";
+
+    public static int getBitrate(String value) {
+        return Integer.parseInt(value) * 1024;
+    }
+}

app/src/main/java/com/fpvout/digiview/streaming/StreamFramerate.java

@@ -0,0 +1,9 @@
+package com.fpvout.digiview.streaming;
+
+public class StreamFramerate {
+    public static final String DEFAULT = "60";
+
+    public static int getFramerate(String value) {
+        return Integer.parseInt(value);
+    }
+}

app/src/main/java/com/fpvout/digiview/streaming/StreamResolution.java

@@ -0,0 +1,37 @@
+package com.fpvout.digiview.streaming;
+
+public class StreamResolution {
+    public static final String DEFAULT = "720p";
+    private final int width;
+    private final int height;
+
+    private StreamResolution(int width, int height) {
+        this.width = width;
+        this.height = height;
+    }
+
+    public static StreamResolution getResolution(String value) {
+        switch (value) {
+            case "240p":
+                return new StreamResolution(426, 240);
+            case "360p":
+                return new StreamResolution(640, 360);
+            case "480p":
+                return new StreamResolution(854, 480);
+            case DEFAULT:
+                return new StreamResolution(1280, 720);
+            case "1080p":
+                return new StreamResolution(1920, 1080);
+        }
+
+        return null;
+    }
+
+    public int getWidth() {
+        return width;
+    }
+
+    public int getHeight() {
+        return height;
+    }
+}