Update to RingRTC v2.44.3

This commit is contained in:
Jim Gustafson
2024-07-08 06:48:13 -07:00
committed by Cody Henthorne
parent d91760eefc
commit a3d1197aef
13 changed files with 24 additions and 21 deletions

View File

@@ -441,9 +441,6 @@ public class ApplicationContext extends MultiDexApplication implements AppForegr
if (RemoteConfig.callingFieldTrialAnyAddressPortsKillSwitch()) {
fieldTrials.put("RingRTC-AnyAddressPortsKillSwitch", "Enabled");
}
if (!SignalStore.internal().callingDisableLBRed()) {
fieldTrials.put("RingRTC-Audio-LBRed-For-Opus", "Enabled,bitrate_pri:22000");
}
CallManager.initialize(this, new RingRtcLogger(), fieldTrials);
} catch (UnsatisfiedLinkError e) {
throw new AssertionError("Unable to load ringrtc library", e);

View File

@@ -520,10 +520,10 @@ class InternalSettingsFragment : DSLSettingsFragment(R.string.preferences__inter
)
switchPref(
title = DSLSettingsText.from("Disable LBRed"),
isChecked = state.callingDisableLBRed,
title = DSLSettingsText.from("Enable Oboe ADM"),
isChecked = state.callingEnableOboeAdm,
onClick = {
viewModel.setInternalCallingDisableLBRed(!state.callingDisableLBRed)
viewModel.setInternalCallingEnableOboeAdm(!state.callingEnableOboeAdm)
}
)

View File

@@ -14,7 +14,7 @@ data class InternalSettingsState(
val callingAudioProcessingMethod: CallManager.AudioProcessingMethod,
val callingDataMode: CallManager.DataMode,
val callingDisableTelecom: Boolean,
val callingDisableLBRed: Boolean,
val callingEnableOboeAdm: Boolean,
val useBuiltInEmojiSet: Boolean,
val emojiVersion: EmojiFiles.Version?,
val removeSenderKeyMinimium: Boolean,

View File

@@ -109,8 +109,8 @@ class InternalSettingsViewModel(private val repository: InternalSettingsReposito
refresh()
}
fun setInternalCallingDisableLBRed(enabled: Boolean) {
preferenceDataStore.putBoolean(InternalValues.CALLING_DISABLE_LBRED, enabled)
fun setInternalCallingEnableOboeAdm(enabled: Boolean) {
preferenceDataStore.putBoolean(InternalValues.CALLING_ENABLE_OBOE_ADM, enabled)
refresh()
}
@@ -150,7 +150,7 @@ class InternalSettingsViewModel(private val repository: InternalSettingsReposito
callingAudioProcessingMethod = SignalStore.internal.callingAudioProcessingMethod(),
callingDataMode = SignalStore.internal.callingDataMode(),
callingDisableTelecom = SignalStore.internal.callingDisableTelecom(),
callingDisableLBRed = SignalStore.internal.callingDisableLBRed(),
callingEnableOboeAdm = SignalStore.internal.callingEnableOboeAdm(),
useBuiltInEmojiSet = SignalStore.internal.forceBuiltInEmoji(),
emojiVersion = null,
removeSenderKeyMinimium = SignalStore.internal.removeSenderKeyMinimum(),

View File

@@ -24,7 +24,7 @@ public final class InternalValues extends SignalStoreValues {
public static final String CALLING_AUDIO_PROCESSING_METHOD = "internal.calling_audio_processing_method";
public static final String CALLING_DATA_MODE = "internal.calling_bandwidth_mode";
public static final String CALLING_DISABLE_TELECOM = "internal.calling_disable_telecom";
public static final String CALLING_DISABLE_LBRED = "internal.calling_disable_lbred";
public static final String CALLING_ENABLE_OBOE_ADM = "internal.calling_enable_oboe_adm";
public static final String SHAKE_TO_REPORT = "internal.shake_to_report";
public static final String DISABLE_STORAGE_SERVICE = "internal.disable_storage_service";
public static final String FORCE_WEBSOCKET_MODE = "internal.force_websocket_mode";
@@ -162,13 +162,13 @@ public final class InternalValues extends SignalStoreValues {
}
/**
* Whether or not LBRed for Opus is manually disabled.
* Whether or not the Oboe ADM is used.
*/
public synchronized boolean callingDisableLBRed() {
public synchronized boolean callingEnableOboeAdm() {
if (RemoteConfig.internalUser()) {
return getBoolean(CALLING_DISABLE_LBRED, false);
return getBoolean(CALLING_ENABLE_OBOE_ADM, true);
} else {
return true;
return false;
}
}

View File

@@ -63,6 +63,7 @@ class CallLinkPreJoinActionProcessor(
ByteArray(0),
AUDIO_LEVELS_INTERVAL,
getAudioProcessingMethod(),
SignalStore.internal.callingEnableOboeAdm(),
webRtcInteractor.groupCallObserver
)
} catch (e: InvalidInputException) {

View File

@@ -53,6 +53,7 @@ public class GroupNetworkUnavailableActionProcessor extends WebRtcActionProcesso
new byte[0],
null,
RingRtcDynamicConfiguration.getAudioProcessingMethod(),
SignalStore.internal().callingEnableOboeAdm(),
webRtcInteractor.getGroupCallObserver());
return currentState.builder()

View File

@@ -51,6 +51,7 @@ public class GroupPreJoinActionProcessor extends GroupActionProcessor {
new byte[0],
AUDIO_LEVELS_INTERVAL,
RingRtcDynamicConfiguration.getAudioProcessingMethod(),
SignalStore.internal().callingEnableOboeAdm(),
webRtcInteractor.getGroupCallObserver());
try {

View File

@@ -102,6 +102,7 @@ public class IncomingCallActionProcessor extends DeviceAwareActionProcessor {
context,
videoState.getLockableEglBase().require(),
RingRtcDynamicConfiguration.getAudioProcessingMethod(),
SignalStore.internal().callingEnableOboeAdm(),
videoState.requireLocalSink(),
callParticipant.getVideoSink(),
videoState.requireCamera(),

View File

@@ -185,6 +185,7 @@ public final class IncomingGroupCallActionProcessor extends DeviceAwareActionPro
new byte[0],
AUDIO_LEVELS_INTERVAL,
RingRtcDynamicConfiguration.getAudioProcessingMethod(),
SignalStore.internal().callingEnableOboeAdm(),
webRtcInteractor.getGroupCallObserver());
try {

View File

@@ -152,6 +152,7 @@ public class OutgoingCallActionProcessor extends DeviceAwareActionProcessor {
context,
videoState.getLockableEglBase().require(),
RingRtcDynamicConfiguration.getAudioProcessingMethod(),
SignalStore.internal().callingEnableOboeAdm(),
videoState.requireLocalSink(),
callParticipant.getVideoSink(),
videoState.requireCamera(),