From c6d4ed3165b47460859e7946249fb34ac2567d27 Mon Sep 17 00:00:00 2001 From: Marcel Hibbe Date: Tue, 27 Feb 2024 14:42:42 +0100 Subject: [PATCH] rename MagicWebRTCUtils to WebRTCUtils Signed-off-by: Marcel Hibbe [skip ci] --- .../main/java/com/nextcloud/talk/activities/CallActivity.kt | 4 ++-- .../java/com/nextcloud/talk/webrtc/PeerConnectionWrapper.java | 4 ++-- .../talk/webrtc/{MagicWebRTCUtils.java => WebRTCUtils.java} | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) rename app/src/main/java/com/nextcloud/talk/webrtc/{MagicWebRTCUtils.java => WebRTCUtils.java} (99%) diff --git a/app/src/main/java/com/nextcloud/talk/activities/CallActivity.kt b/app/src/main/java/com/nextcloud/talk/activities/CallActivity.kt index 07f555975..b80cf974d 100644 --- a/app/src/main/java/com/nextcloud/talk/activities/CallActivity.kt +++ b/app/src/main/java/com/nextcloud/talk/activities/CallActivity.kt @@ -144,7 +144,7 @@ import com.nextcloud.talk.viewmodels.CallRecordingViewModel.RecordingConfirmStop import com.nextcloud.talk.viewmodels.CallRecordingViewModel.RecordingErrorState import com.nextcloud.talk.viewmodels.CallRecordingViewModel.RecordingStartedState import com.nextcloud.talk.viewmodels.CallRecordingViewModel.RecordingStartingState -import com.nextcloud.talk.webrtc.MagicWebRTCUtils +import com.nextcloud.talk.webrtc.WebRTCUtils import com.nextcloud.talk.webrtc.PeerConnectionWrapper import com.nextcloud.talk.webrtc.PeerConnectionWrapper.PeerConnectionObserver import com.nextcloud.talk.webrtc.WebRtcAudioManager @@ -727,7 +727,7 @@ class CallActivity : CallBaseActivity() { cameraEnumerator = if (camera2EnumeratorIsSupported) { Camera2Enumerator(this) } else { - Camera1Enumerator(MagicWebRTCUtils.shouldEnableVideoHardwareAcceleration()) + Camera1Enumerator(WebRTCUtils.shouldEnableVideoHardwareAcceleration()) } } diff --git a/app/src/main/java/com/nextcloud/talk/webrtc/PeerConnectionWrapper.java b/app/src/main/java/com/nextcloud/talk/webrtc/PeerConnectionWrapper.java index 5fe613623..9fc1ce98e 100644 --- a/app/src/main/java/com/nextcloud/talk/webrtc/PeerConnectionWrapper.java +++ b/app/src/main/java/com/nextcloud/talk/webrtc/PeerConnectionWrapper.java @@ -367,7 +367,7 @@ public class PeerConnectionWrapper { SessionDescription sessionDescriptionWithPreferredCodec; boolean isAudio = false; - String sessionDescriptionStringWithPreferredCodec = MagicWebRTCUtils.preferCodec(sdp, "H264", isAudio); + String sessionDescriptionStringWithPreferredCodec = WebRTCUtils.preferCodec(sdp, "H264", isAudio); sessionDescriptionWithPreferredCodec = new SessionDescription( SessionDescription.Type.fromCanonicalForm(type), @@ -574,7 +574,7 @@ public class PeerConnectionWrapper { ncMessagePayload.setType(type); SessionDescription sessionDescriptionWithPreferredCodec; - String sessionDescriptionStringWithPreferredCodec = MagicWebRTCUtils.preferCodec + String sessionDescriptionStringWithPreferredCodec = WebRTCUtils.preferCodec (sessionDescription.description, "H264", false); sessionDescriptionWithPreferredCodec = new SessionDescription( diff --git a/app/src/main/java/com/nextcloud/talk/webrtc/MagicWebRTCUtils.java b/app/src/main/java/com/nextcloud/talk/webrtc/WebRTCUtils.java similarity index 99% rename from app/src/main/java/com/nextcloud/talk/webrtc/MagicWebRTCUtils.java rename to app/src/main/java/com/nextcloud/talk/webrtc/WebRTCUtils.java index e94aed198..c4cfeaeee 100644 --- a/app/src/main/java/com/nextcloud/talk/webrtc/MagicWebRTCUtils.java +++ b/app/src/main/java/com/nextcloud/talk/webrtc/WebRTCUtils.java @@ -38,7 +38,7 @@ import java.util.*; import java.util.regex.Matcher; import java.util.regex.Pattern; -public class MagicWebRTCUtils { +public class WebRTCUtils { private static final String TAG = "MagicWebRTCUtils"; private static final Set HARDWARE_ACCELERATION_DEVICE_EXCLUDE_SET = new HashSet() {{