From ec9984c86b36c3504baa504e5bd78afd0fdbe19a Mon Sep 17 00:00:00 2001 From: Sylvain Berfini Date: Tue, 21 Jan 2025 11:44:21 +0100 Subject: [PATCH] Show if audio codec is mono or stereo --- .../org/linphone/ui/main/settings/model/CodecModel.kt | 10 +++++++++- .../ui/main/settings/viewmodel/SettingsViewModel.kt | 3 ++- app/src/main/res/values-fr/strings.xml | 2 ++ app/src/main/res/values/strings.xml | 2 ++ 4 files changed, 15 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/org/linphone/ui/main/settings/model/CodecModel.kt b/app/src/main/java/org/linphone/ui/main/settings/model/CodecModel.kt index d6339cdf1..4a979299b 100644 --- a/app/src/main/java/org/linphone/ui/main/settings/model/CodecModel.kt +++ b/app/src/main/java/org/linphone/ui/main/settings/model/CodecModel.kt @@ -22,12 +22,15 @@ package org.linphone.ui.main.settings.model import androidx.annotation.UiThread import androidx.annotation.WorkerThread import androidx.lifecycle.MutableLiveData +import org.linphone.utils.AppUtils +import org.linphone.R class CodecModel @WorkerThread constructor( val mimeType: String, clockRate: Int, + channels: Int, recvFmtp: String?, isAudioCodec: Boolean, enabled: Boolean, @@ -40,7 +43,12 @@ class CodecModel init { isEnabled.postValue(enabled) if (isAudioCodec) { - subtitle.postValue("$clockRate Hz") + val monoStereo = if (channels > 1) { + AppUtils.getString(R.string.settings_advanced_audio_codecs_stereo_subtitle) + } else { + AppUtils.getString(R.string.settings_advanced_audio_codecs_mono_subtitle) + } + subtitle.postValue("$clockRate Hz ($monoStereo)") } else { subtitle.postValue(recvFmtp.orEmpty()) } diff --git a/app/src/main/java/org/linphone/ui/main/settings/viewmodel/SettingsViewModel.kt b/app/src/main/java/org/linphone/ui/main/settings/viewmodel/SettingsViewModel.kt index a92a8a701..ddee54845 100644 --- a/app/src/main/java/org/linphone/ui/main/settings/viewmodel/SettingsViewModel.kt +++ b/app/src/main/java/org/linphone/ui/main/settings/viewmodel/SettingsViewModel.kt @@ -853,6 +853,7 @@ class SettingsViewModel val model = CodecModel( payload.mimeType, payload.clockRate, + payload.channels, null, true, payload.enabled() @@ -865,7 +866,7 @@ class SettingsViewModel val videoCodecsList = arrayListOf() for (payload in core.videoPayloadTypes) { - val model = CodecModel(payload.mimeType, -1, payload.recvFmtp, false, payload.enabled()) { enabled -> + val model = CodecModel(payload.mimeType, -1, 0, payload.recvFmtp, false, payload.enabled()) { enabled -> payload.enable(enabled) } videoCodecsList.add(model) diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 00235ec2d..7e78cacaf 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -268,6 +268,8 @@ Périphérique de capture par défaut Périphérique d\'écoute par défaut Codecs audio + mono + stéréo Codecs vidéo Paramètres Android de &appName; diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 79f1cc6fd..da5720aaa 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -307,6 +307,8 @@ Default input audio device Default output audio device Audio codecs + mono + stereo Video codecs &appName; Android settings