diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 099127b334b..9bcccb2da25 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -49,7 +49,7 @@ turbine = "0.13.0" itu = "1.7.3" streamWebRTC = "137.1.1" -streamNoiseCancellation = "1.0.4" +streamNoiseCancellation = "2.0.0" streamResult = "1.3.0" streamChat = "6.10.0" streamLog = "1.3.2" @@ -154,7 +154,7 @@ tink = { group = "com.google.crypto.tink", name = "tink-android", version.ref = turbine = { group = "app.cash.turbine", name = "turbine", version.ref = "turbine" } ituDate = { group = "com.ethlo.time", name = "itu", version.ref = "itu" } - stream-webrtc = { group = "io.getstream", name = "stream-video-webrtc-android", version.ref = "streamWebRTC" } + stream-webrtc = { group = "io.getstream", name = "stream-video-webrtc-android-repackaged", version.ref = "streamWebRTC" } stream-result = { group = "io.getstream", name = "stream-result", version.ref = "streamResult" } stream-result-call = { group = "io.getstream", name = "stream-result-call", version.ref = "streamResult" } stream-renderscript = { group = "io.getstream", name = "stream-video-renderscript-android", version.ref = "streamRenderscript" } diff --git a/scripts/repackage/utils/repackage_video_sdk.py b/scripts/repackage/utils/repackage_video_sdk.py deleted file mode 100644 index 0c45224947e..00000000000 --- a/scripts/repackage/utils/repackage_video_sdk.py +++ /dev/null @@ -1,134 +0,0 @@ -import os -import re -from datetime import datetime - -from utils.gradle_publish import override_gradle_publish -from utils.gradle_settings import modify_gradle_settings -from utils.maven import install_android_lib_module_to_local_maven -from utils.project_configuration import extract_version_name_and_artifact_group -from utils.string_replacement import replace_string_in_directory - - -def repackage_and_install_video_sdk(project_root: str, repackaged_webrtc_version: str): - start_time = int(datetime.utcnow().timestamp() * 1000) - os.chdir(project_root) - - configuration_path = os.path.join( - "buildSrc", "src", "main", "kotlin", "io", "getstream", "video", "android", - "Configuration.kt" - ) - project_version, group_id = extract_version_name_and_artifact_group(configuration_path) - print(f"> VideoSDK: version => {project_version}") - print(f"> VideoSDK: groupId => {group_id}") - - # Repackage - print(f"> VideoSDK: Repackage Started") - replace_string_in_directory( - directory_path=project_root, - search_string="org.webrtc", - replace_string="io.getstream.webrtc" - ) - print(f"> VideoSDK: Repackage Completed") - - # Modify settings.gradle file - os.chdir(project_root) - modify_gradle_settings() - print(f"> VideoSDK: settings.gradle has been modified") - - # Modify publish-module.gradle file - os.chdir(project_root) - override_gradle_publish(os.path.join('scripts', 'publish-module.gradle')) - print("> VideoSDK: publish-module.gradle has been modified") - - # Modify libs.versions.toml file - os.chdir(project_root) - _modify_gradle_libs_version(repackaged_webrtc_version) - - # Modify build.gradle files - os.chdir(project_root) - _modify_build_gradle_files(project_root) - - # Install modules - os.chdir(project_root) - _install_modules() - - # Updates dependencies in "dogfooding" - os.chdir(project_root) - _update_dogfooding_dependencies(project_root, group_id) - - now = int(datetime.utcnow().timestamp() * 1000) - elapsed = now - start_time - print(f"\nREPACKAGE SUCCESSFUL (VideoSDK) in {elapsed}ms") - - -def _modify_gradle_libs_version(repackaged_webrtc_version: str): - file_path = os.path.join("gradle", "libs.versions.toml") - - # streamWebRTC = "1.1.0" - with open(file_path, 'r') as file: - lines = file.readlines() - - with open(file_path, 'w') as file: - for line in lines: - if line.startswith("streamWebRTC"): - line = f'streamWebRTC = "{repackaged_webrtc_version}"\n' - elif "stream-webrtc-android" in line: - line = line.replace("stream-webrtc-android", "streamx-webrtc-android") - file.write(line) - print(f"...{file_path} has been modified.") - - -def _modify_build_gradle_files(folder: str) -> None: - for subdir, _, files in os.walk(folder): - for filename in files: - if 'build.gradle' in filename: - file_path = os.path.join(subdir, filename) - _modify_build_gradle(file_path) - - -def _modify_build_gradle(file_path: str) -> None: - # Read the content of the file - with open(file_path, 'r') as file: - lines = file.readlines() - - with open(file_path, 'w') as file: - for line in lines: - if "PUBLISH_ARTIFACT_ID" in line: - line = line.replace("stream-video-android", "streamx-video-android") - file.write(line) - - print(f"...{file_path} has been modified.") - - -def _install_modules(): - modules = [ - "stream-video-android-previewdata", - "stream-video-android-core", - "stream-video-android-ui-core", - "stream-video-android-ui-compose", - "stream-video-android-ui-xml", - ] - for module in modules: - install_android_lib_module_to_local_maven(module) - - -def _update_dogfooding_dependencies(project_root: str, group_id: str) -> None: - # Read the content of the file - - file_path = os.path.join(project_root, "demo-app", "build.gradle.kts") - with open(file_path, 'r') as file: - lines = file.readlines() - - with open(file_path, 'w') as file: - for line in lines: - if 'implementation(project(":stream-video-android-' in line: - match = re.search(r'stream-video-android-(\w+)', line) - dep_id = match.group(1) - line = f' implementation("{group_id}:streamx-video-android-{dep_id}:${{Configuration.versionName}}")\n' - if 'compileOnly(project(":stream-video-android-' in line: - match = re.search(r'stream-video-android-(\w+)', line) - dep_id = match.group(1) - line = f' compileOnly("{group_id}:streamx-video-android-{dep_id}:${{Configuration.versionName}}")\n' - file.write(line) - - print(f"...{file_path} has been modified.") \ No newline at end of file diff --git a/scripts/repackage/utils/repackage_webrtc_android.py b/scripts/repackage/utils/repackage_webrtc_android.py index 2ded1a2b2b1..ac183889a73 100644 --- a/scripts/repackage/utils/repackage_webrtc_android.py +++ b/scripts/repackage/utils/repackage_webrtc_android.py @@ -32,7 +32,7 @@ def repackage_and_install_webrtc_android(path: str) -> str: print("> WebRTC-Android: Repackage Started") replace_string_in_directory( directory_path=path, - search_string="org.webrtc", + search_string="io.getstream.webrtc", replace_string="io.getstream.webrtc" ) print("> WebRTC-Android: Repackage Completed") diff --git a/stream-video-android-core/api/stream-video-android-core.api b/stream-video-android-core/api/stream-video-android-core.api index f435ce1480d..2672599ce4f 100644 --- a/stream-video-android-core/api/stream-video-android-core.api +++ b/stream-video-android-core/api/stream-video-android-core.api @@ -8609,7 +8609,7 @@ public final class io/getstream/video/android/core/Call { public static synthetic fun muteUsers$default (Lio/getstream/video/android/core/Call;Ljava/util/List;ZZZLkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object; public final fun notify (Lkotlin/coroutines/Continuation;)Ljava/lang/Object; public final fun pinForEveryone (Ljava/lang/String;Ljava/lang/String;Lkotlin/coroutines/Continuation;)Ljava/lang/Object; - public final fun processAudioSample (Lorg/webrtc/audio/JavaAudioDeviceModule$AudioSamples;)V + public final fun processAudioSample (Lio/getstream/webrtc/audio/JavaAudioDeviceModule$AudioSamples;)V public final fun queryMembers (Ljava/util/Map;Ljava/util/List;ILjava/lang/String;Ljava/lang/String;Lkotlin/coroutines/Continuation;)Ljava/lang/Object; public static synthetic fun queryMembers$default (Lio/getstream/video/android/core/Call;Ljava/util/Map;Ljava/util/List;ILjava/lang/String;Ljava/lang/String;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object; public final fun reject (Lio/getstream/video/android/core/model/RejectReason;Lkotlin/coroutines/Continuation;)Ljava/lang/Object; @@ -8834,8 +8834,8 @@ public final class io/getstream/video/android/core/CameraDirection$Front : io/ge } public final class io/getstream/video/android/core/CameraManager { - public fun (Lio/getstream/video/android/core/MediaManagerImpl;Lorg/webrtc/EglBase$Context;Lio/getstream/video/android/core/camera/CameraCharacteristicsValidator;Lio/getstream/video/android/core/CameraDirection;)V - public synthetic fun (Lio/getstream/video/android/core/MediaManagerImpl;Lorg/webrtc/EglBase$Context;Lio/getstream/video/android/core/camera/CameraCharacteristicsValidator;Lio/getstream/video/android/core/CameraDirection;ILkotlin/jvm/internal/DefaultConstructorMarker;)V + public fun (Lio/getstream/video/android/core/MediaManagerImpl;Lio/getstream/webrtc/EglBase$Context;Lio/getstream/video/android/core/camera/CameraCharacteristicsValidator;Lio/getstream/video/android/core/CameraDirection;)V + public synthetic fun (Lio/getstream/video/android/core/MediaManagerImpl;Lio/getstream/webrtc/EglBase$Context;Lio/getstream/video/android/core/camera/CameraCharacteristicsValidator;Lio/getstream/video/android/core/CameraDirection;ILkotlin/jvm/internal/DefaultConstructorMarker;)V public final fun cleanup ()V public final fun disable (Z)V public static synthetic fun disable$default (Lio/getstream/video/android/core/CameraManager;ZILjava/lang/Object;)V @@ -8843,7 +8843,7 @@ public final class io/getstream/video/android/core/CameraManager { public final fun getAvailableResolutions ()Lkotlinx/coroutines/flow/StateFlow; public final fun getCameraCharacteristicsValidator ()Lio/getstream/video/android/core/camera/CameraCharacteristicsValidator; public final fun getDirection ()Lkotlinx/coroutines/flow/StateFlow; - public final fun getEglBaseContext ()Lorg/webrtc/EglBase$Context; + public final fun getEglBaseContext ()Lio/getstream/webrtc/EglBase$Context; public final fun getMediaManager ()Lio/getstream/video/android/core/MediaManagerImpl; public final fun getResolution ()Lkotlinx/coroutines/flow/StateFlow; public final fun getSelectedDevice ()Lkotlinx/coroutines/flow/StateFlow; @@ -8988,22 +8988,22 @@ public final class io/getstream/video/android/core/GEO$GlobalEdgeNetwork : io/ge } public final class io/getstream/video/android/core/LocalStats { - public fun (Lorg/webrtc/CameraEnumerationAndroid$CaptureFormat;Ljava/util/List;Lorg/webrtc/CameraEnumerationAndroid$CaptureFormat;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V - public final fun component1 ()Lorg/webrtc/CameraEnumerationAndroid$CaptureFormat; + public fun (Lio/getstream/webrtc/CameraEnumerationAndroid$CaptureFormat;Ljava/util/List;Lio/getstream/webrtc/CameraEnumerationAndroid$CaptureFormat;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V + public final fun component1 ()Lio/getstream/webrtc/CameraEnumerationAndroid$CaptureFormat; public final fun component2 ()Ljava/util/List; - public final fun component3 ()Lorg/webrtc/CameraEnumerationAndroid$CaptureFormat; + public final fun component3 ()Lio/getstream/webrtc/CameraEnumerationAndroid$CaptureFormat; public final fun component4 ()Ljava/lang/String; public final fun component5 ()Ljava/lang/String; public final fun component6 ()Ljava/lang/String; public final fun component7 ()Ljava/lang/String; - public final fun copy (Lorg/webrtc/CameraEnumerationAndroid$CaptureFormat;Ljava/util/List;Lorg/webrtc/CameraEnumerationAndroid$CaptureFormat;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Lio/getstream/video/android/core/LocalStats; - public static synthetic fun copy$default (Lio/getstream/video/android/core/LocalStats;Lorg/webrtc/CameraEnumerationAndroid$CaptureFormat;Ljava/util/List;Lorg/webrtc/CameraEnumerationAndroid$CaptureFormat;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ILjava/lang/Object;)Lio/getstream/video/android/core/LocalStats; + public final fun copy (Lio/getstream/webrtc/CameraEnumerationAndroid$CaptureFormat;Ljava/util/List;Lio/getstream/webrtc/CameraEnumerationAndroid$CaptureFormat;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Lio/getstream/video/android/core/LocalStats; + public static synthetic fun copy$default (Lio/getstream/video/android/core/LocalStats;Lio/getstream/webrtc/CameraEnumerationAndroid$CaptureFormat;Ljava/util/List;Lio/getstream/webrtc/CameraEnumerationAndroid$CaptureFormat;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ILjava/lang/Object;)Lio/getstream/video/android/core/LocalStats; public fun equals (Ljava/lang/Object;)Z public final fun getAvailableResolutions ()Ljava/util/List; public final fun getDeviceModel ()Ljava/lang/String; - public final fun getMaxResolution ()Lorg/webrtc/CameraEnumerationAndroid$CaptureFormat; + public final fun getMaxResolution ()Lio/getstream/webrtc/CameraEnumerationAndroid$CaptureFormat; public final fun getOs ()Ljava/lang/String; - public final fun getResolution ()Lorg/webrtc/CameraEnumerationAndroid$CaptureFormat; + public final fun getResolution ()Lio/getstream/webrtc/CameraEnumerationAndroid$CaptureFormat; public final fun getSdkVersion ()Ljava/lang/String; public final fun getSfu ()Ljava/lang/String; public fun hashCode ()I @@ -9011,28 +9011,28 @@ public final class io/getstream/video/android/core/LocalStats { } public final class io/getstream/video/android/core/MediaManagerImpl { - public fun (Landroid/content/Context;Lio/getstream/video/android/core/Call;Lkotlinx/coroutines/CoroutineScope;Lorg/webrtc/EglBase$Context;ILkotlin/jvm/functions/Function0;)V - public synthetic fun (Landroid/content/Context;Lio/getstream/video/android/core/Call;Lkotlinx/coroutines/CoroutineScope;Lorg/webrtc/EglBase$Context;ILkotlin/jvm/functions/Function0;ILkotlin/jvm/internal/DefaultConstructorMarker;)V + public fun (Landroid/content/Context;Lio/getstream/video/android/core/Call;Lkotlinx/coroutines/CoroutineScope;Lio/getstream/webrtc/EglBase$Context;ILkotlin/jvm/functions/Function0;)V + public synthetic fun (Landroid/content/Context;Lio/getstream/video/android/core/Call;Lkotlinx/coroutines/CoroutineScope;Lio/getstream/webrtc/EglBase$Context;ILkotlin/jvm/functions/Function0;ILkotlin/jvm/internal/DefaultConstructorMarker;)V public final fun cleanup ()V - public final fun getAudioSource ()Lorg/webrtc/AudioSource; - public final fun getAudioTrack ()Lorg/webrtc/AudioTrack; + public final fun getAudioSource ()Lio/getstream/webrtc/AudioSource; + public final fun getAudioTrack ()Lio/getstream/webrtc/AudioTrack; public final fun getAudioUsage ()I public final fun getAudioUsageProvider ()Lkotlin/jvm/functions/Function0; public final fun getCall ()Lio/getstream/video/android/core/Call; public final fun getContext ()Landroid/content/Context; - public final fun getEglBaseContext ()Lorg/webrtc/EglBase$Context; + public final fun getEglBaseContext ()Lio/getstream/webrtc/EglBase$Context; public final fun getScope ()Lkotlinx/coroutines/CoroutineScope; - public final fun getScreenShareTrack ()Lorg/webrtc/VideoTrack; - public final fun getScreenShareVideoSource ()Lorg/webrtc/VideoSource; - public final fun getVideoSource ()Lorg/webrtc/VideoSource; - public final fun getVideoTrack ()Lorg/webrtc/VideoTrack; - public final fun setAudioTrack (Lorg/webrtc/AudioTrack;)V - public final fun setScreenShareTrack (Lorg/webrtc/VideoTrack;)V - public final fun setVideoTrack (Lorg/webrtc/VideoTrack;)V + public final fun getScreenShareTrack ()Lio/getstream/webrtc/VideoTrack; + public final fun getScreenShareVideoSource ()Lio/getstream/webrtc/VideoSource; + public final fun getVideoSource ()Lio/getstream/webrtc/VideoSource; + public final fun getVideoTrack ()Lio/getstream/webrtc/VideoTrack; + public final fun setAudioTrack (Lio/getstream/webrtc/AudioTrack;)V + public final fun setScreenShareTrack (Lio/getstream/webrtc/VideoTrack;)V + public final fun setVideoTrack (Lio/getstream/webrtc/VideoTrack;)V } public final class io/getstream/video/android/core/MediaManagerKt { - public static final fun trySetEnabled (Lorg/webrtc/MediaStreamTrack;Z)V + public static final fun trySetEnabled (Lio/getstream/webrtc/MediaStreamTrack;Z)V } public final class io/getstream/video/android/core/MediaStatsInfo { @@ -9358,13 +9358,13 @@ public final class io/getstream/video/android/core/RingingState$TimeoutNoAnswer public final class io/getstream/video/android/core/ScreenShareManager { public static final field Companion Lio/getstream/video/android/core/ScreenShareManager$Companion; - public fun (Lio/getstream/video/android/core/MediaManagerImpl;Lorg/webrtc/EglBase$Context;)V + public fun (Lio/getstream/video/android/core/MediaManagerImpl;Lio/getstream/webrtc/EglBase$Context;)V public final fun disable (Z)V public static synthetic fun disable$default (Lio/getstream/video/android/core/ScreenShareManager;ZILjava/lang/Object;)V public final fun enable (Landroid/content/Intent;ZZ)V public static synthetic fun enable$default (Lio/getstream/video/android/core/ScreenShareManager;Landroid/content/Intent;ZZILjava/lang/Object;)V public final fun getAudioEnabled ()Lkotlinx/coroutines/flow/StateFlow; - public final fun getEglBaseContext ()Lorg/webrtc/EglBase$Context; + public final fun getEglBaseContext ()Lio/getstream/webrtc/EglBase$Context; public final fun getMediaManager ()Lio/getstream/video/android/core/MediaManagerImpl; public final fun getStatus ()Lkotlinx/coroutines/flow/StateFlow; public final fun isEnabled ()Lkotlinx/coroutines/flow/StateFlow; @@ -9458,14 +9458,14 @@ public final class io/getstream/video/android/core/StreamVideoBuilder { public fun (Landroid/content/Context;Ljava/lang/String;Lio/getstream/video/android/core/GEO;Lio/getstream/video/android/model/User;Ljava/lang/String;Lkotlin/jvm/functions/Function2;Lio/getstream/video/android/core/socket/common/token/TokenProvider;Lio/getstream/video/android/core/logging/LoggingLevel;Lio/getstream/video/android/core/notifications/NotificationConfig;Lkotlin/jvm/functions/Function1;JZLjava/lang/String;ZLio/getstream/video/android/core/notifications/internal/service/CallServiceConfig;Lio/getstream/video/android/core/notifications/internal/service/CallServiceConfigRegistry;Ljava/lang/String;Lio/getstream/video/android/core/sounds/Sounds;Lio/getstream/video/android/core/sounds/RingingCallVibrationConfig;ZLio/getstream/video/android/core/permission/android/StreamPermissionCheck;)V public fun (Landroid/content/Context;Ljava/lang/String;Lio/getstream/video/android/core/GEO;Lio/getstream/video/android/model/User;Ljava/lang/String;Lkotlin/jvm/functions/Function2;Lio/getstream/video/android/core/socket/common/token/TokenProvider;Lio/getstream/video/android/core/logging/LoggingLevel;Lio/getstream/video/android/core/notifications/NotificationConfig;Lkotlin/jvm/functions/Function1;JZLjava/lang/String;ZLio/getstream/video/android/core/notifications/internal/service/CallServiceConfig;Lio/getstream/video/android/core/notifications/internal/service/CallServiceConfigRegistry;Ljava/lang/String;Lio/getstream/video/android/core/sounds/Sounds;Lio/getstream/video/android/core/sounds/RingingCallVibrationConfig;ZLio/getstream/video/android/core/permission/android/StreamPermissionCheck;I)V public fun (Landroid/content/Context;Ljava/lang/String;Lio/getstream/video/android/core/GEO;Lio/getstream/video/android/model/User;Ljava/lang/String;Lkotlin/jvm/functions/Function2;Lio/getstream/video/android/core/socket/common/token/TokenProvider;Lio/getstream/video/android/core/logging/LoggingLevel;Lio/getstream/video/android/core/notifications/NotificationConfig;Lkotlin/jvm/functions/Function1;JZLjava/lang/String;ZLio/getstream/video/android/core/notifications/internal/service/CallServiceConfig;Lio/getstream/video/android/core/notifications/internal/service/CallServiceConfigRegistry;Ljava/lang/String;Lio/getstream/video/android/core/sounds/Sounds;Lio/getstream/video/android/core/sounds/RingingCallVibrationConfig;ZLio/getstream/video/android/core/permission/android/StreamPermissionCheck;ILjava/lang/String;)V - public fun (Landroid/content/Context;Ljava/lang/String;Lio/getstream/video/android/core/GEO;Lio/getstream/video/android/model/User;Ljava/lang/String;Lkotlin/jvm/functions/Function2;Lio/getstream/video/android/core/socket/common/token/TokenProvider;Lio/getstream/video/android/core/logging/LoggingLevel;Lio/getstream/video/android/core/notifications/NotificationConfig;Lkotlin/jvm/functions/Function1;JZLjava/lang/String;ZLio/getstream/video/android/core/notifications/internal/service/CallServiceConfig;Lio/getstream/video/android/core/notifications/internal/service/CallServiceConfigRegistry;Ljava/lang/String;Lio/getstream/video/android/core/sounds/Sounds;Lio/getstream/video/android/core/sounds/RingingCallVibrationConfig;ZLio/getstream/video/android/core/permission/android/StreamPermissionCheck;ILjava/lang/String;Lorg/webrtc/ManagedAudioProcessingFactory;)V - public fun (Landroid/content/Context;Ljava/lang/String;Lio/getstream/video/android/core/GEO;Lio/getstream/video/android/model/User;Ljava/lang/String;Lkotlin/jvm/functions/Function2;Lio/getstream/video/android/core/socket/common/token/TokenProvider;Lio/getstream/video/android/core/logging/LoggingLevel;Lio/getstream/video/android/core/notifications/NotificationConfig;Lkotlin/jvm/functions/Function1;JZLjava/lang/String;ZLio/getstream/video/android/core/notifications/internal/service/CallServiceConfig;Lio/getstream/video/android/core/notifications/internal/service/CallServiceConfigRegistry;Ljava/lang/String;Lio/getstream/video/android/core/sounds/Sounds;Lio/getstream/video/android/core/sounds/RingingCallVibrationConfig;ZLio/getstream/video/android/core/permission/android/StreamPermissionCheck;ILjava/lang/String;Lorg/webrtc/ManagedAudioProcessingFactory;J)V - public fun (Landroid/content/Context;Ljava/lang/String;Lio/getstream/video/android/core/GEO;Lio/getstream/video/android/model/User;Ljava/lang/String;Lkotlin/jvm/functions/Function2;Lio/getstream/video/android/core/socket/common/token/TokenProvider;Lio/getstream/video/android/core/logging/LoggingLevel;Lio/getstream/video/android/core/notifications/NotificationConfig;Lkotlin/jvm/functions/Function1;JZLjava/lang/String;ZLio/getstream/video/android/core/notifications/internal/service/CallServiceConfig;Lio/getstream/video/android/core/notifications/internal/service/CallServiceConfigRegistry;Ljava/lang/String;Lio/getstream/video/android/core/sounds/Sounds;Lio/getstream/video/android/core/sounds/RingingCallVibrationConfig;ZLio/getstream/video/android/core/permission/android/StreamPermissionCheck;ILjava/lang/String;Lorg/webrtc/ManagedAudioProcessingFactory;JZ)V - public fun (Landroid/content/Context;Ljava/lang/String;Lio/getstream/video/android/core/GEO;Lio/getstream/video/android/model/User;Ljava/lang/String;Lkotlin/jvm/functions/Function2;Lio/getstream/video/android/core/socket/common/token/TokenProvider;Lio/getstream/video/android/core/logging/LoggingLevel;Lio/getstream/video/android/core/notifications/NotificationConfig;Lkotlin/jvm/functions/Function1;JZLjava/lang/String;ZLio/getstream/video/android/core/notifications/internal/service/CallServiceConfig;Lio/getstream/video/android/core/notifications/internal/service/CallServiceConfigRegistry;Ljava/lang/String;Lio/getstream/video/android/core/sounds/Sounds;Lio/getstream/video/android/core/sounds/RingingCallVibrationConfig;ZLio/getstream/video/android/core/permission/android/StreamPermissionCheck;ILjava/lang/String;Lorg/webrtc/ManagedAudioProcessingFactory;JZZ)V - public fun (Landroid/content/Context;Ljava/lang/String;Lio/getstream/video/android/core/GEO;Lio/getstream/video/android/model/User;Ljava/lang/String;Lkotlin/jvm/functions/Function2;Lio/getstream/video/android/core/socket/common/token/TokenProvider;Lio/getstream/video/android/core/logging/LoggingLevel;Lio/getstream/video/android/core/notifications/NotificationConfig;Lkotlin/jvm/functions/Function1;JZLjava/lang/String;ZLio/getstream/video/android/core/notifications/internal/service/CallServiceConfig;Lio/getstream/video/android/core/notifications/internal/service/CallServiceConfigRegistry;Ljava/lang/String;Lio/getstream/video/android/core/sounds/Sounds;Lio/getstream/video/android/core/sounds/RingingCallVibrationConfig;ZLio/getstream/video/android/core/permission/android/StreamPermissionCheck;ILjava/lang/String;Lorg/webrtc/ManagedAudioProcessingFactory;JZZZ)V - public fun (Landroid/content/Context;Ljava/lang/String;Lio/getstream/video/android/core/GEO;Lio/getstream/video/android/model/User;Ljava/lang/String;Lkotlin/jvm/functions/Function2;Lio/getstream/video/android/core/socket/common/token/TokenProvider;Lio/getstream/video/android/core/logging/LoggingLevel;Lio/getstream/video/android/core/notifications/NotificationConfig;Lkotlin/jvm/functions/Function1;JZLjava/lang/String;ZLio/getstream/video/android/core/notifications/internal/service/CallServiceConfig;Lio/getstream/video/android/core/notifications/internal/service/CallServiceConfigRegistry;Ljava/lang/String;Lio/getstream/video/android/core/sounds/Sounds;Lio/getstream/video/android/core/sounds/RingingCallVibrationConfig;ZLio/getstream/video/android/core/permission/android/StreamPermissionCheck;ILjava/lang/String;Lorg/webrtc/ManagedAudioProcessingFactory;JZZZLio/getstream/video/android/core/notifications/internal/telecom/TelecomConfig;)V - public fun (Landroid/content/Context;Ljava/lang/String;Lio/getstream/video/android/core/GEO;Lio/getstream/video/android/model/User;Ljava/lang/String;Lkotlin/jvm/functions/Function2;Lio/getstream/video/android/core/socket/common/token/TokenProvider;Lio/getstream/video/android/core/logging/LoggingLevel;Lio/getstream/video/android/core/notifications/NotificationConfig;Lkotlin/jvm/functions/Function1;JZLjava/lang/String;ZLio/getstream/video/android/core/notifications/internal/service/CallServiceConfig;Lio/getstream/video/android/core/notifications/internal/service/CallServiceConfigRegistry;Ljava/lang/String;Lio/getstream/video/android/core/sounds/Sounds;Lio/getstream/video/android/core/sounds/RingingCallVibrationConfig;ZLio/getstream/video/android/core/permission/android/StreamPermissionCheck;ILjava/lang/String;Lorg/webrtc/ManagedAudioProcessingFactory;JZZZLio/getstream/video/android/core/notifications/internal/telecom/TelecomConfig;Z)V - public synthetic fun (Landroid/content/Context;Ljava/lang/String;Lio/getstream/video/android/core/GEO;Lio/getstream/video/android/model/User;Ljava/lang/String;Lkotlin/jvm/functions/Function2;Lio/getstream/video/android/core/socket/common/token/TokenProvider;Lio/getstream/video/android/core/logging/LoggingLevel;Lio/getstream/video/android/core/notifications/NotificationConfig;Lkotlin/jvm/functions/Function1;JZLjava/lang/String;ZLio/getstream/video/android/core/notifications/internal/service/CallServiceConfig;Lio/getstream/video/android/core/notifications/internal/service/CallServiceConfigRegistry;Ljava/lang/String;Lio/getstream/video/android/core/sounds/Sounds;Lio/getstream/video/android/core/sounds/RingingCallVibrationConfig;ZLio/getstream/video/android/core/permission/android/StreamPermissionCheck;ILjava/lang/String;Lorg/webrtc/ManagedAudioProcessingFactory;JZZZLio/getstream/video/android/core/notifications/internal/telecom/TelecomConfig;ZILkotlin/jvm/internal/DefaultConstructorMarker;)V + public fun (Landroid/content/Context;Ljava/lang/String;Lio/getstream/video/android/core/GEO;Lio/getstream/video/android/model/User;Ljava/lang/String;Lkotlin/jvm/functions/Function2;Lio/getstream/video/android/core/socket/common/token/TokenProvider;Lio/getstream/video/android/core/logging/LoggingLevel;Lio/getstream/video/android/core/notifications/NotificationConfig;Lkotlin/jvm/functions/Function1;JZLjava/lang/String;ZLio/getstream/video/android/core/notifications/internal/service/CallServiceConfig;Lio/getstream/video/android/core/notifications/internal/service/CallServiceConfigRegistry;Ljava/lang/String;Lio/getstream/video/android/core/sounds/Sounds;Lio/getstream/video/android/core/sounds/RingingCallVibrationConfig;ZLio/getstream/video/android/core/permission/android/StreamPermissionCheck;ILjava/lang/String;Lio/getstream/webrtc/ManagedAudioProcessingFactory;)V + public fun (Landroid/content/Context;Ljava/lang/String;Lio/getstream/video/android/core/GEO;Lio/getstream/video/android/model/User;Ljava/lang/String;Lkotlin/jvm/functions/Function2;Lio/getstream/video/android/core/socket/common/token/TokenProvider;Lio/getstream/video/android/core/logging/LoggingLevel;Lio/getstream/video/android/core/notifications/NotificationConfig;Lkotlin/jvm/functions/Function1;JZLjava/lang/String;ZLio/getstream/video/android/core/notifications/internal/service/CallServiceConfig;Lio/getstream/video/android/core/notifications/internal/service/CallServiceConfigRegistry;Ljava/lang/String;Lio/getstream/video/android/core/sounds/Sounds;Lio/getstream/video/android/core/sounds/RingingCallVibrationConfig;ZLio/getstream/video/android/core/permission/android/StreamPermissionCheck;ILjava/lang/String;Lio/getstream/webrtc/ManagedAudioProcessingFactory;J)V + public fun (Landroid/content/Context;Ljava/lang/String;Lio/getstream/video/android/core/GEO;Lio/getstream/video/android/model/User;Ljava/lang/String;Lkotlin/jvm/functions/Function2;Lio/getstream/video/android/core/socket/common/token/TokenProvider;Lio/getstream/video/android/core/logging/LoggingLevel;Lio/getstream/video/android/core/notifications/NotificationConfig;Lkotlin/jvm/functions/Function1;JZLjava/lang/String;ZLio/getstream/video/android/core/notifications/internal/service/CallServiceConfig;Lio/getstream/video/android/core/notifications/internal/service/CallServiceConfigRegistry;Ljava/lang/String;Lio/getstream/video/android/core/sounds/Sounds;Lio/getstream/video/android/core/sounds/RingingCallVibrationConfig;ZLio/getstream/video/android/core/permission/android/StreamPermissionCheck;ILjava/lang/String;Lio/getstream/webrtc/ManagedAudioProcessingFactory;JZ)V + public fun (Landroid/content/Context;Ljava/lang/String;Lio/getstream/video/android/core/GEO;Lio/getstream/video/android/model/User;Ljava/lang/String;Lkotlin/jvm/functions/Function2;Lio/getstream/video/android/core/socket/common/token/TokenProvider;Lio/getstream/video/android/core/logging/LoggingLevel;Lio/getstream/video/android/core/notifications/NotificationConfig;Lkotlin/jvm/functions/Function1;JZLjava/lang/String;ZLio/getstream/video/android/core/notifications/internal/service/CallServiceConfig;Lio/getstream/video/android/core/notifications/internal/service/CallServiceConfigRegistry;Ljava/lang/String;Lio/getstream/video/android/core/sounds/Sounds;Lio/getstream/video/android/core/sounds/RingingCallVibrationConfig;ZLio/getstream/video/android/core/permission/android/StreamPermissionCheck;ILjava/lang/String;Lio/getstream/webrtc/ManagedAudioProcessingFactory;JZZ)V + public fun (Landroid/content/Context;Ljava/lang/String;Lio/getstream/video/android/core/GEO;Lio/getstream/video/android/model/User;Ljava/lang/String;Lkotlin/jvm/functions/Function2;Lio/getstream/video/android/core/socket/common/token/TokenProvider;Lio/getstream/video/android/core/logging/LoggingLevel;Lio/getstream/video/android/core/notifications/NotificationConfig;Lkotlin/jvm/functions/Function1;JZLjava/lang/String;ZLio/getstream/video/android/core/notifications/internal/service/CallServiceConfig;Lio/getstream/video/android/core/notifications/internal/service/CallServiceConfigRegistry;Ljava/lang/String;Lio/getstream/video/android/core/sounds/Sounds;Lio/getstream/video/android/core/sounds/RingingCallVibrationConfig;ZLio/getstream/video/android/core/permission/android/StreamPermissionCheck;ILjava/lang/String;Lio/getstream/webrtc/ManagedAudioProcessingFactory;JZZZ)V + public fun (Landroid/content/Context;Ljava/lang/String;Lio/getstream/video/android/core/GEO;Lio/getstream/video/android/model/User;Ljava/lang/String;Lkotlin/jvm/functions/Function2;Lio/getstream/video/android/core/socket/common/token/TokenProvider;Lio/getstream/video/android/core/logging/LoggingLevel;Lio/getstream/video/android/core/notifications/NotificationConfig;Lkotlin/jvm/functions/Function1;JZLjava/lang/String;ZLio/getstream/video/android/core/notifications/internal/service/CallServiceConfig;Lio/getstream/video/android/core/notifications/internal/service/CallServiceConfigRegistry;Ljava/lang/String;Lio/getstream/video/android/core/sounds/Sounds;Lio/getstream/video/android/core/sounds/RingingCallVibrationConfig;ZLio/getstream/video/android/core/permission/android/StreamPermissionCheck;ILjava/lang/String;Lio/getstream/webrtc/ManagedAudioProcessingFactory;JZZZLio/getstream/video/android/core/notifications/internal/telecom/TelecomConfig;)V + public fun (Landroid/content/Context;Ljava/lang/String;Lio/getstream/video/android/core/GEO;Lio/getstream/video/android/model/User;Ljava/lang/String;Lkotlin/jvm/functions/Function2;Lio/getstream/video/android/core/socket/common/token/TokenProvider;Lio/getstream/video/android/core/logging/LoggingLevel;Lio/getstream/video/android/core/notifications/NotificationConfig;Lkotlin/jvm/functions/Function1;JZLjava/lang/String;ZLio/getstream/video/android/core/notifications/internal/service/CallServiceConfig;Lio/getstream/video/android/core/notifications/internal/service/CallServiceConfigRegistry;Ljava/lang/String;Lio/getstream/video/android/core/sounds/Sounds;Lio/getstream/video/android/core/sounds/RingingCallVibrationConfig;ZLio/getstream/video/android/core/permission/android/StreamPermissionCheck;ILjava/lang/String;Lio/getstream/webrtc/ManagedAudioProcessingFactory;JZZZLio/getstream/video/android/core/notifications/internal/telecom/TelecomConfig;Z)V + public synthetic fun (Landroid/content/Context;Ljava/lang/String;Lio/getstream/video/android/core/GEO;Lio/getstream/video/android/model/User;Ljava/lang/String;Lkotlin/jvm/functions/Function2;Lio/getstream/video/android/core/socket/common/token/TokenProvider;Lio/getstream/video/android/core/logging/LoggingLevel;Lio/getstream/video/android/core/notifications/NotificationConfig;Lkotlin/jvm/functions/Function1;JZLjava/lang/String;ZLio/getstream/video/android/core/notifications/internal/service/CallServiceConfig;Lio/getstream/video/android/core/notifications/internal/service/CallServiceConfigRegistry;Ljava/lang/String;Lio/getstream/video/android/core/sounds/Sounds;Lio/getstream/video/android/core/sounds/RingingCallVibrationConfig;ZLio/getstream/video/android/core/permission/android/StreamPermissionCheck;ILjava/lang/String;Lio/getstream/webrtc/ManagedAudioProcessingFactory;JZZZLio/getstream/video/android/core/notifications/internal/telecom/TelecomConfig;ZILkotlin/jvm/internal/DefaultConstructorMarker;)V public final fun build ()Lio/getstream/video/android/core/StreamVideo; } @@ -9674,61 +9674,61 @@ public abstract interface class io/getstream/video/android/core/call/audio/Input public abstract fun applyFilter (IIILjava/nio/ByteBuffer;)V } -public class io/getstream/video/android/core/call/connection/StreamPeerConnection : org/webrtc/PeerConnection$Observer { - public fun (Lio/getstream/video/android/core/model/StreamPeerType;Lorg/webrtc/MediaConstraints;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function0;IZLio/getstream/video/android/core/trace/Tracer;Ljava/lang/String;)V - public synthetic fun (Lio/getstream/video/android/core/model/StreamPeerType;Lorg/webrtc/MediaConstraints;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function0;IZLio/getstream/video/android/core/trace/Tracer;Ljava/lang/String;ILkotlin/jvm/internal/DefaultConstructorMarker;)V - public final fun addAudioTransceiver (Lorg/webrtc/MediaStreamTrack;Ljava/util/List;)V +public class io/getstream/video/android/core/call/connection/StreamPeerConnection : io/getstream/webrtc/PeerConnection$Observer { + public fun (Lio/getstream/video/android/core/model/StreamPeerType;Lio/getstream/webrtc/MediaConstraints;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function0;IZLio/getstream/video/android/core/trace/Tracer;Ljava/lang/String;)V + public synthetic fun (Lio/getstream/video/android/core/model/StreamPeerType;Lio/getstream/webrtc/MediaConstraints;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function0;IZLio/getstream/video/android/core/trace/Tracer;Ljava/lang/String;ILkotlin/jvm/internal/DefaultConstructorMarker;)V + public final fun addAudioTransceiver (Lio/getstream/webrtc/MediaStreamTrack;Ljava/util/List;)V public final fun addIceCandidate (Lio/getstream/video/android/core/model/IceCandidate;Lkotlin/coroutines/Continuation;)Ljava/lang/Object; - public final fun addVideoTransceiver (Lorg/webrtc/MediaStreamTrack;Ljava/util/List;Z)V + public final fun addVideoTransceiver (Lio/getstream/webrtc/MediaStreamTrack;Ljava/util/List;Z)V public final fun close ()V - public final fun createAnswer (Lorg/webrtc/MediaConstraints;Lkotlin/coroutines/Continuation;)Ljava/lang/Object; - public static synthetic fun createAnswer$default (Lio/getstream/video/android/core/call/connection/StreamPeerConnection;Lorg/webrtc/MediaConstraints;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object; - public final fun createOffer (Lorg/webrtc/MediaConstraints;Lkotlin/coroutines/Continuation;)Ljava/lang/Object; - public static synthetic fun createOffer$default (Lio/getstream/video/android/core/call/connection/StreamPeerConnection;Lorg/webrtc/MediaConstraints;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object; - public final fun getAudioTransceiver ()Lorg/webrtc/RtpTransceiver; - public final fun getConnection ()Lorg/webrtc/PeerConnection; + public final fun createAnswer (Lio/getstream/webrtc/MediaConstraints;Lkotlin/coroutines/Continuation;)Ljava/lang/Object; + public static synthetic fun createAnswer$default (Lio/getstream/video/android/core/call/connection/StreamPeerConnection;Lio/getstream/webrtc/MediaConstraints;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object; + public final fun createOffer (Lio/getstream/webrtc/MediaConstraints;Lkotlin/coroutines/Continuation;)Ljava/lang/Object; + public static synthetic fun createOffer$default (Lio/getstream/video/android/core/call/connection/StreamPeerConnection;Lio/getstream/webrtc/MediaConstraints;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object; + public final fun getAudioTransceiver ()Lio/getstream/webrtc/RtpTransceiver; + public final fun getConnection ()Lio/getstream/webrtc/PeerConnection; public final fun getStats (Lkotlin/coroutines/Continuation;)Ljava/lang/Object; - public final fun getVideoTransceiver ()Lorg/webrtc/RtpTransceiver; + public final fun getVideoTransceiver ()Lio/getstream/webrtc/RtpTransceiver; public final fun handleNewIceCandidate (Lio/getstream/video/android/core/model/IceCandidate;Lkotlin/coroutines/Continuation;)Ljava/lang/Object; - public final fun initialize (Lorg/webrtc/PeerConnection;)V + public final fun initialize (Lio/getstream/webrtc/PeerConnection;)V public final fun isFailedOrClosed ()Z public final fun isHealthy ()Z - public fun onAddStream (Lorg/webrtc/MediaStream;)V - public fun onAddTrack (Lorg/webrtc/RtpReceiver;[Lorg/webrtc/MediaStream;)V - public fun onConnectionChange (Lorg/webrtc/PeerConnection$PeerConnectionState;)V - public fun onDataChannel (Lorg/webrtc/DataChannel;)V - public fun onIceCandidate (Lorg/webrtc/IceCandidate;)V - public fun onIceCandidateError (Lorg/webrtc/IceCandidateErrorEvent;)V - public fun onIceCandidatesRemoved ([Lorg/webrtc/IceCandidate;)V - public fun onIceConnectionChange (Lorg/webrtc/PeerConnection$IceConnectionState;)V + public fun onAddStream (Lio/getstream/webrtc/MediaStream;)V + public fun onAddTrack (Lio/getstream/webrtc/RtpReceiver;[Lio/getstream/webrtc/MediaStream;)V + public fun onConnectionChange (Lio/getstream/webrtc/PeerConnection$PeerConnectionState;)V + public fun onDataChannel (Lio/getstream/webrtc/DataChannel;)V + public fun onIceCandidate (Lio/getstream/webrtc/IceCandidate;)V + public fun onIceCandidateError (Lio/getstream/webrtc/IceCandidateErrorEvent;)V + public fun onIceCandidatesRemoved ([Lio/getstream/webrtc/IceCandidate;)V + public fun onIceConnectionChange (Lio/getstream/webrtc/PeerConnection$IceConnectionState;)V public fun onIceConnectionReceivingChange (Z)V - public fun onIceGatheringChange (Lorg/webrtc/PeerConnection$IceGatheringState;)V - public fun onRemoveStream (Lorg/webrtc/MediaStream;)V - public fun onRemoveTrack (Lorg/webrtc/RtpReceiver;)V + public fun onIceGatheringChange (Lio/getstream/webrtc/PeerConnection$IceGatheringState;)V + public fun onRemoveStream (Lio/getstream/webrtc/MediaStream;)V + public fun onRemoveTrack (Lio/getstream/webrtc/RtpReceiver;)V public fun onRenegotiationNeeded ()V - public fun onSelectedCandidatePairChanged (Lorg/webrtc/CandidatePairChangeEvent;)V - public fun onSignalingChange (Lorg/webrtc/PeerConnection$SignalingState;)V - public fun onTrack (Lorg/webrtc/RtpTransceiver;)V - public final fun setLocalDescription (Lorg/webrtc/SessionDescription;Lkotlin/coroutines/Continuation;)Ljava/lang/Object; - public final fun setRemoteDescription (Lorg/webrtc/SessionDescription;Lkotlin/coroutines/Continuation;)Ljava/lang/Object; + public fun onSelectedCandidatePairChanged (Lio/getstream/webrtc/CandidatePairChangeEvent;)V + public fun onSignalingChange (Lio/getstream/webrtc/PeerConnection$SignalingState;)V + public fun onTrack (Lio/getstream/webrtc/RtpTransceiver;)V + public final fun setLocalDescription (Lio/getstream/webrtc/SessionDescription;Lkotlin/coroutines/Continuation;)Ljava/lang/Object; + public final fun setRemoteDescription (Lio/getstream/webrtc/SessionDescription;Lkotlin/coroutines/Continuation;)Ljava/lang/Object; public fun stats (Lkotlin/coroutines/Continuation;)Ljava/lang/Object; public fun toString ()Ljava/lang/String; public final fun tracer ()Lio/getstream/video/android/core/trace/Tracer; } public final class io/getstream/video/android/core/call/connection/StreamPeerConnectionFactory { - public fun (Landroid/content/Context;ILkotlin/jvm/functions/Function0;Lorg/webrtc/ManagedAudioProcessingFactory;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function0;)V - public synthetic fun (Landroid/content/Context;ILkotlin/jvm/functions/Function0;Lorg/webrtc/ManagedAudioProcessingFactory;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function0;ILkotlin/jvm/internal/DefaultConstructorMarker;)V + public fun (Landroid/content/Context;ILkotlin/jvm/functions/Function0;Lio/getstream/webrtc/ManagedAudioProcessingFactory;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function0;)V + public synthetic fun (Landroid/content/Context;ILkotlin/jvm/functions/Function0;Lio/getstream/webrtc/ManagedAudioProcessingFactory;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function0;ILkotlin/jvm/internal/DefaultConstructorMarker;)V public final fun clearPreferredAudioInputDevice ()V - public final fun getEglBase ()Lorg/webrtc/EglBase; - public final fun getSenderCapabilities (Lorg/webrtc/MediaStreamTrack$MediaType;)Lorg/webrtc/RtpCapabilities; + public final fun getEglBase ()Lio/getstream/webrtc/EglBase; + public final fun getSenderCapabilities (Lio/getstream/webrtc/MediaStreamTrack$MediaType;)Lio/getstream/webrtc/RtpCapabilities; public final fun isAudioProcessingEnabled ()Z - public final fun makeAudioSource (Lorg/webrtc/MediaConstraints;)Lorg/webrtc/AudioSource; - public static synthetic fun makeAudioSource$default (Lio/getstream/video/android/core/call/connection/StreamPeerConnectionFactory;Lorg/webrtc/MediaConstraints;ILjava/lang/Object;)Lorg/webrtc/AudioSource; - public final fun makeAudioTrack (Lorg/webrtc/AudioSource;Ljava/lang/String;)Lorg/webrtc/AudioTrack; - public final fun makePeerConnection (Lorg/webrtc/PeerConnection$RTCConfiguration;Lio/getstream/video/android/core/model/StreamPeerType;Lorg/webrtc/MediaConstraints;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function2;ILjava/lang/String;)Lio/getstream/video/android/core/call/connection/StreamPeerConnection; - public static synthetic fun makePeerConnection$default (Lio/getstream/video/android/core/call/connection/StreamPeerConnectionFactory;Lorg/webrtc/PeerConnection$RTCConfiguration;Lio/getstream/video/android/core/model/StreamPeerType;Lorg/webrtc/MediaConstraints;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function2;ILjava/lang/String;ILjava/lang/Object;)Lio/getstream/video/android/core/call/connection/StreamPeerConnection; - public final fun makeVideoTrack (Lorg/webrtc/VideoSource;Ljava/lang/String;)Lorg/webrtc/VideoTrack; + public final fun makeAudioSource (Lio/getstream/webrtc/MediaConstraints;)Lio/getstream/webrtc/AudioSource; + public static synthetic fun makeAudioSource$default (Lio/getstream/video/android/core/call/connection/StreamPeerConnectionFactory;Lio/getstream/webrtc/MediaConstraints;ILjava/lang/Object;)Lio/getstream/webrtc/AudioSource; + public final fun makeAudioTrack (Lio/getstream/webrtc/AudioSource;Ljava/lang/String;)Lio/getstream/webrtc/AudioTrack; + public final fun makePeerConnection (Lio/getstream/webrtc/PeerConnection$RTCConfiguration;Lio/getstream/video/android/core/model/StreamPeerType;Lio/getstream/webrtc/MediaConstraints;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function2;ILjava/lang/String;)Lio/getstream/video/android/core/call/connection/StreamPeerConnection; + public static synthetic fun makePeerConnection$default (Lio/getstream/video/android/core/call/connection/StreamPeerConnectionFactory;Lio/getstream/webrtc/PeerConnection$RTCConfiguration;Lio/getstream/video/android/core/model/StreamPeerType;Lio/getstream/webrtc/MediaConstraints;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function2;ILjava/lang/String;ILjava/lang/Object;)Lio/getstream/video/android/core/call/connection/StreamPeerConnection; + public final fun makeVideoTrack (Lio/getstream/webrtc/VideoSource;Ljava/lang/String;)Lio/getstream/webrtc/VideoTrack; public final fun setAudioProcessingEnabled (Z)V public final fun setAudioRecordDataCallback (Lkotlin/jvm/functions/Function4;)V public final fun setAudioSampleCallback (Lkotlin/jvm/functions/Function1;)V @@ -9905,7 +9905,7 @@ public final class io/getstream/video/android/core/call/state/ToggleSpeakerphone } public final class io/getstream/video/android/core/call/stats/RtcMapperKt { - public static final fun toRtcStats (Lorg/webrtc/RTCStatsReport;)Ljava/util/Map; + public static final fun toRtcStats (Lio/getstream/webrtc/RTCStatsReport;)Ljava/util/Map; } public final class io/getstream/video/android/core/call/stats/model/RtcAudioSourceStats : io/getstream/video/android/core/call/stats/model/RtcMediaSourceStats { @@ -11430,13 +11430,13 @@ public abstract interface class io/getstream/video/android/core/call/stats/model } public final class io/getstream/video/android/core/call/stats/model/RtcStatsReport { - public fun (Lorg/webrtc/RTCStatsReport;Ljava/util/Map;)V - public final fun component1 ()Lorg/webrtc/RTCStatsReport; + public fun (Lio/getstream/webrtc/RTCStatsReport;Ljava/util/Map;)V + public final fun component1 ()Lio/getstream/webrtc/RTCStatsReport; public final fun component2 ()Ljava/util/Map; - public final fun copy (Lorg/webrtc/RTCStatsReport;Ljava/util/Map;)Lio/getstream/video/android/core/call/stats/model/RtcStatsReport; - public static synthetic fun copy$default (Lio/getstream/video/android/core/call/stats/model/RtcStatsReport;Lorg/webrtc/RTCStatsReport;Ljava/util/Map;ILjava/lang/Object;)Lio/getstream/video/android/core/call/stats/model/RtcStatsReport; + public final fun copy (Lio/getstream/webrtc/RTCStatsReport;Ljava/util/Map;)Lio/getstream/video/android/core/call/stats/model/RtcStatsReport; + public static synthetic fun copy$default (Lio/getstream/video/android/core/call/stats/model/RtcStatsReport;Lio/getstream/webrtc/RTCStatsReport;Ljava/util/Map;ILjava/lang/Object;)Lio/getstream/video/android/core/call/stats/model/RtcStatsReport; public fun equals (Ljava/lang/Object;)Z - public final fun getOrigin ()Lorg/webrtc/RTCStatsReport; + public final fun getOrigin ()Lio/getstream/webrtc/RTCStatsReport; public final fun getParsed ()Ljava/util/Map; public fun hashCode ()I public fun toString ()Ljava/lang/String; @@ -11549,7 +11549,7 @@ public abstract class io/getstream/video/android/core/call/video/BitmapVideoFilt public abstract class io/getstream/video/android/core/call/video/RawVideoFilter : io/getstream/video/android/core/call/video/VideoFilter { public fun ()V - public abstract fun applyFilter (Lorg/webrtc/VideoFrame;Lorg/webrtc/SurfaceTextureHelper;)Lorg/webrtc/VideoFrame; + public abstract fun applyFilter (Lio/getstream/webrtc/VideoFrame;Lio/getstream/webrtc/SurfaceTextureHelper;)Lio/getstream/webrtc/VideoFrame; } public class io/getstream/video/android/core/call/video/VideoFilter { @@ -11557,7 +11557,7 @@ public class io/getstream/video/android/core/call/video/VideoFilter { public final class io/getstream/video/android/core/call/video/YuvFrame { public static final field INSTANCE Lio/getstream/video/android/core/call/video/YuvFrame; - public final fun bitmapFromVideoFrame (Lorg/webrtc/VideoFrame;)Landroid/graphics/Bitmap; + public final fun bitmapFromVideoFrame (Lio/getstream/webrtc/VideoFrame;)Landroid/graphics/Bitmap; } public final class io/getstream/video/android/core/closedcaptions/ClosedCaptionDeduplicationConfig { @@ -12385,13 +12385,13 @@ public final class io/getstream/video/android/core/mapper/ReactionMapper$Compani } public final class io/getstream/video/android/core/model/AudioTrack : io/getstream/video/android/core/model/MediaTrack { - public fun (Ljava/lang/String;Lorg/webrtc/AudioTrack;)V + public fun (Ljava/lang/String;Lio/getstream/webrtc/AudioTrack;)V public final fun component1 ()Ljava/lang/String; - public final fun component2 ()Lorg/webrtc/AudioTrack; - public final fun copy (Ljava/lang/String;Lorg/webrtc/AudioTrack;)Lio/getstream/video/android/core/model/AudioTrack; - public static synthetic fun copy$default (Lio/getstream/video/android/core/model/AudioTrack;Ljava/lang/String;Lorg/webrtc/AudioTrack;ILjava/lang/Object;)Lio/getstream/video/android/core/model/AudioTrack; + public final fun component2 ()Lio/getstream/webrtc/AudioTrack; + public final fun copy (Ljava/lang/String;Lio/getstream/webrtc/AudioTrack;)Lio/getstream/video/android/core/model/AudioTrack; + public static synthetic fun copy$default (Lio/getstream/video/android/core/model/AudioTrack;Ljava/lang/String;Lio/getstream/webrtc/AudioTrack;ILjava/lang/Object;)Lio/getstream/video/android/core/model/AudioTrack; public fun equals (Ljava/lang/Object;)Z - public final fun getAudio ()Lorg/webrtc/AudioTrack; + public final fun getAudio ()Lio/getstream/webrtc/AudioTrack; public fun getStreamId ()Ljava/lang/String; public fun hashCode ()I public fun toString ()Ljava/lang/String; @@ -13063,14 +13063,14 @@ public final class io/getstream/video/android/core/model/VideoModelKt { } public final class io/getstream/video/android/core/model/VideoTrack : io/getstream/video/android/core/model/MediaTrack { - public fun (Ljava/lang/String;Lorg/webrtc/VideoTrack;)V + public fun (Ljava/lang/String;Lio/getstream/webrtc/VideoTrack;)V public final fun component1 ()Ljava/lang/String; - public final fun component2 ()Lorg/webrtc/VideoTrack; - public final fun copy (Ljava/lang/String;Lorg/webrtc/VideoTrack;)Lio/getstream/video/android/core/model/VideoTrack; - public static synthetic fun copy$default (Lio/getstream/video/android/core/model/VideoTrack;Ljava/lang/String;Lorg/webrtc/VideoTrack;ILjava/lang/Object;)Lio/getstream/video/android/core/model/VideoTrack; + public final fun component2 ()Lio/getstream/webrtc/VideoTrack; + public final fun copy (Ljava/lang/String;Lio/getstream/webrtc/VideoTrack;)Lio/getstream/video/android/core/model/VideoTrack; + public static synthetic fun copy$default (Lio/getstream/video/android/core/model/VideoTrack;Ljava/lang/String;Lio/getstream/webrtc/VideoTrack;ILjava/lang/Object;)Lio/getstream/video/android/core/model/VideoTrack; public fun equals (Ljava/lang/Object;)Z public fun getStreamId ()Ljava/lang/String; - public final fun getVideo ()Lorg/webrtc/VideoTrack; + public final fun getVideo ()Lio/getstream/webrtc/VideoTrack; public fun hashCode ()I public fun toString ()Ljava/lang/String; } @@ -14644,8 +14644,8 @@ public final class io/getstream/video/android/core/utils/AndroidUtilsKt { } public final class io/getstream/video/android/core/utils/CallClientUtilsKt { - public static final fun mangleSdpUtil (Lorg/webrtc/SessionDescription;ZZZ)Lorg/webrtc/SessionDescription; - public static synthetic fun mangleSdpUtil$default (Lorg/webrtc/SessionDescription;ZZZILjava/lang/Object;)Lorg/webrtc/SessionDescription; + public static final fun mangleSdpUtil (Lio/getstream/webrtc/SessionDescription;ZZZ)Lio/getstream/webrtc/SessionDescription; + public static synthetic fun mangleSdpUtil$default (Lio/getstream/webrtc/SessionDescription;ZZZILjava/lang/Object;)Lio/getstream/webrtc/SessionDescription; } public final class io/getstream/video/android/core/utils/DerivedStateFlow : kotlinx/coroutines/flow/StateFlow { @@ -16242,13 +16242,13 @@ public final class io/getstream/video/android/model/mapper/StreamCallCidMapperKt public static final fun toTypeAndId (Ljava/lang/String;)Lkotlin/Pair; } -public class io/getstream/webrtc/android/ui/VideoTextureViewRenderer : android/view/TextureView, android/view/TextureView$SurfaceTextureListener, org/webrtc/VideoSink { +public class io/getstream/webrtc/android/ui/VideoTextureViewRenderer : android/view/TextureView, android/view/TextureView$SurfaceTextureListener, io/getstream/webrtc/VideoSink { public fun (Landroid/content/Context;)V public fun (Landroid/content/Context;Landroid/util/AttributeSet;)V public synthetic fun (Landroid/content/Context;Landroid/util/AttributeSet;ILkotlin/jvm/internal/DefaultConstructorMarker;)V - public final fun init (Lorg/webrtc/EglBase$Context;Lorg/webrtc/RendererCommon$RendererEvents;)V + public final fun init (Lio/getstream/webrtc/EglBase$Context;Lio/getstream/webrtc/RendererCommon$RendererEvents;)V protected fun onDetachedFromWindow ()V - public fun onFrame (Lorg/webrtc/VideoFrame;)V + public fun onFrame (Lio/getstream/webrtc/VideoFrame;)V protected fun onLayout (ZIIII)V protected fun onMeasure (II)V public fun onSurfaceTextureAvailable (Landroid/graphics/SurfaceTexture;II)V @@ -16258,8 +16258,8 @@ public class io/getstream/webrtc/android/ui/VideoTextureViewRenderer : android/v public final fun pauseVideo ()V public final fun resumeVideo ()V public final fun setMirror (Z)V - public final fun setScalingType (Lorg/webrtc/RendererCommon$ScalingType;)V - public final fun setScalingType (Lorg/webrtc/RendererCommon$ScalingType;Lorg/webrtc/RendererCommon$ScalingType;)V + public final fun setScalingType (Lio/getstream/webrtc/RendererCommon$ScalingType;)V + public final fun setScalingType (Lio/getstream/webrtc/RendererCommon$ScalingType;Lio/getstream/webrtc/RendererCommon$ScalingType;)V } public final class stream/video/sfu/event/AudioLevel : com/squareup/wire/Message { diff --git a/stream-video-android-core/build.gradle.kts b/stream-video-android-core/build.gradle.kts index b26e81bd5b5..3bffb697998 100644 --- a/stream-video-android-core/build.gradle.kts +++ b/stream-video-android-core/build.gradle.kts @@ -131,7 +131,7 @@ baselineProfile { include("io.getstream.video.android.datastore.**") include("io.getstream.video.android.model.**") include("io.getstream.android.video.generated.**") - include("org.webrtc.**") + include("io.getstream.webrtc.**") } } diff --git a/stream-video-android-core/consumer-proguard-rules.pro b/stream-video-android-core/consumer-proguard-rules.pro index 2cb490d0e3d..66c8fff7d9b 100644 --- a/stream-video-android-core/consumer-proguard-rules.pro +++ b/stream-video-android-core/consumer-proguard-rules.pro @@ -70,7 +70,7 @@ -keep class io.getstream.android.push.delegate.AndroidPushDelegateProvider { *; } -keep class io.getstream.android.push.permissions.PushPermissionsInitializer { *; } -# defines consumer proguard rules for org.webrt --keep class org.webrtc.** { *; } +# Consumer ProGuard rules for io.getstream.webrtc (repackaged WebRTC) +-keep class io.getstream.webrtc.** { *; } # Keep the jni_zero library (required by modern WebRTC) --keep class org.jni_zero.** { *; } \ No newline at end of file +-keep class org.jni_zero.** { *; } diff --git a/stream-video-android-core/src/androidTest/kotlin/io/getstream/video/android/core/AndroidDeviceTest.kt b/stream-video-android-core/src/androidTest/kotlin/io/getstream/video/android/core/AndroidDeviceTest.kt index 9d90abb8171..528c38a195b 100644 --- a/stream-video-android-core/src/androidTest/kotlin/io/getstream/video/android/core/AndroidDeviceTest.kt +++ b/stream-video-android-core/src/androidTest/kotlin/io/getstream/video/android/core/AndroidDeviceTest.kt @@ -24,6 +24,12 @@ import io.getstream.log.taggedLogger import io.getstream.video.android.core.api.SignalServerService import io.getstream.video.android.core.call.video.FilterVideoProcessor import io.getstream.video.android.core.utils.buildAudioConstraints +import io.getstream.webrtc.DefaultVideoDecoderFactory +import io.getstream.webrtc.DefaultVideoEncoderFactory +import io.getstream.webrtc.MediaStreamTrack +import io.getstream.webrtc.PeerConnection +import io.getstream.webrtc.RTCStats +import io.getstream.webrtc.VideoCodecInfo import kotlinx.coroutines.delay import kotlinx.coroutines.test.runTest import okhttp3.Interceptor @@ -31,12 +37,6 @@ import okhttp3.OkHttpClient import okhttp3.Request import okhttp3.Response import org.junit.Test -import org.webrtc.DefaultVideoDecoderFactory -import org.webrtc.DefaultVideoEncoderFactory -import org.webrtc.MediaStreamTrack -import org.webrtc.PeerConnection -import org.webrtc.RTCStats -import org.webrtc.VideoCodecInfo import retrofit2.Retrofit import retrofit2.converter.wire.WireConverterFactory import stream.video.sfu.signal.UpdateMuteStatesRequest diff --git a/stream-video-android-core/src/androidTest/kotlin/io/getstream/video/android/core/ReconnectTest.kt b/stream-video-android-core/src/androidTest/kotlin/io/getstream/video/android/core/ReconnectTest.kt index ca29f96bc5a..f496abb6763 100644 --- a/stream-video-android-core/src/androidTest/kotlin/io/getstream/video/android/core/ReconnectTest.kt +++ b/stream-video-android-core/src/androidTest/kotlin/io/getstream/video/android/core/ReconnectTest.kt @@ -19,11 +19,11 @@ package io.getstream.video.android.core import app.cash.turbine.testIn import com.google.common.truth.Truth.assertThat import io.getstream.log.taggedLogger +import io.getstream.webrtc.PeerConnection import kotlinx.coroutines.launch import kotlinx.coroutines.test.runTest import org.junit.Ignore import org.junit.Test -import org.webrtc.PeerConnection import java.util.UUID /** diff --git a/stream-video-android-core/src/main/kotlin/io/getstream/video/android/core/Call.kt b/stream-video-android-core/src/main/kotlin/io/getstream/video/android/core/Call.kt index cee95fe4646..01df3fcc067 100644 --- a/stream-video-android-core/src/main/kotlin/io/getstream/video/android/core/Call.kt +++ b/stream-video-android-core/src/main/kotlin/io/getstream/video/android/core/Call.kt @@ -96,7 +96,12 @@ import io.getstream.video.android.core.utils.safeCall import io.getstream.video.android.core.utils.safeCallWithDefault import io.getstream.video.android.core.utils.toQueriedMembers import io.getstream.video.android.model.User +import io.getstream.webrtc.EglBase +import io.getstream.webrtc.PeerConnection +import io.getstream.webrtc.RendererCommon +import io.getstream.webrtc.VideoSink import io.getstream.webrtc.android.ui.VideoTextureViewRenderer +import io.getstream.webrtc.audio.JavaAudioDeviceModule.AudioSamples import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Job import kotlinx.coroutines.SupervisorJob @@ -111,11 +116,6 @@ import kotlinx.coroutines.isActive import kotlinx.coroutines.launch import kotlinx.coroutines.suspendCancellableCoroutine import org.threeten.bp.OffsetDateTime -import org.webrtc.EglBase -import org.webrtc.PeerConnection -import org.webrtc.RendererCommon -import org.webrtc.VideoSink -import org.webrtc.audio.JavaAudioDeviceModule.AudioSamples import stream.video.sfu.event.ReconnectDetails import stream.video.sfu.models.ClientCapability import stream.video.sfu.models.TrackType diff --git a/stream-video-android-core/src/main/kotlin/io/getstream/video/android/core/CallHealthMonitor.kt b/stream-video-android-core/src/main/kotlin/io/getstream/video/android/core/CallHealthMonitor.kt index 0580309f517..671eabe043e 100644 --- a/stream-video-android-core/src/main/kotlin/io/getstream/video/android/core/CallHealthMonitor.kt +++ b/stream-video-android-core/src/main/kotlin/io/getstream/video/android/core/CallHealthMonitor.kt @@ -16,8 +16,8 @@ package io.getstream.video.android.core +import io.getstream.webrtc.PeerConnection import kotlinx.coroutines.CoroutineScope -import org.webrtc.PeerConnection /** * Monitors diff --git a/stream-video-android-core/src/main/kotlin/io/getstream/video/android/core/CallStats.kt b/stream-video-android-core/src/main/kotlin/io/getstream/video/android/core/CallStats.kt index 9e6ab56d45f..68ff617247d 100644 --- a/stream-video-android-core/src/main/kotlin/io/getstream/video/android/core/CallStats.kt +++ b/stream-video-android-core/src/main/kotlin/io/getstream/video/android/core/CallStats.kt @@ -19,14 +19,14 @@ package io.getstream.video.android.core import android.os.Build import io.getstream.log.taggedLogger import io.getstream.video.android.core.call.stats.model.RtcStatsReport +import io.getstream.webrtc.CameraEnumerationAndroid +import io.getstream.webrtc.RTCStats import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.SupervisorJob import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.SharingStarted import kotlinx.coroutines.flow.StateFlow import kotlinx.coroutines.flow.stateIn -import org.webrtc.CameraEnumerationAndroid -import org.webrtc.RTCStats import stream.video.sfu.models.TrackType data class MediaStatsInfo( diff --git a/stream-video-android-core/src/main/kotlin/io/getstream/video/android/core/CallStatsReport.kt b/stream-video-android-core/src/main/kotlin/io/getstream/video/android/core/CallStatsReport.kt index e4bfebabc40..810aaf6f876 100644 --- a/stream-video-android-core/src/main/kotlin/io/getstream/video/android/core/CallStatsReport.kt +++ b/stream-video-android-core/src/main/kotlin/io/getstream/video/android/core/CallStatsReport.kt @@ -20,10 +20,10 @@ import android.util.Log import io.getstream.video.android.core.call.stats.model.RtcStatsReport import io.getstream.video.android.core.internal.InternalStreamVideoApi import io.getstream.video.android.core.model.StreamPeerType +import io.getstream.webrtc.RTCStats import org.json.JSONArray import org.json.JSONException import org.json.JSONObject -import org.webrtc.RTCStats @InternalStreamVideoApi data class CallStatsReport( diff --git a/stream-video-android-core/src/main/kotlin/io/getstream/video/android/core/MediaManager.kt b/stream-video-android-core/src/main/kotlin/io/getstream/video/android/core/MediaManager.kt index 71d6d5702a0..3d4ca40959d 100644 --- a/stream-video-android-core/src/main/kotlin/io/getstream/video/android/core/MediaManager.kt +++ b/stream-video-android-core/src/main/kotlin/io/getstream/video/android/core/MediaManager.kt @@ -54,6 +54,18 @@ import io.getstream.video.android.core.screenshare.StreamScreenShareService import io.getstream.video.android.core.utils.buildAudioConstraints import io.getstream.video.android.core.utils.mapState import io.getstream.video.android.core.utils.safeCall +import io.getstream.webrtc.AudioSource +import io.getstream.webrtc.AudioTrack +import io.getstream.webrtc.Camera2Capturer +import io.getstream.webrtc.Camera2Enumerator +import io.getstream.webrtc.CameraEnumerationAndroid +import io.getstream.webrtc.CameraVideoCapturer +import io.getstream.webrtc.EglBase +import io.getstream.webrtc.MediaStreamTrack +import io.getstream.webrtc.ScreenCapturerAndroid +import io.getstream.webrtc.SurfaceTextureHelper +import io.getstream.webrtc.VideoSource +import io.getstream.webrtc.VideoTrack import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Job import kotlinx.coroutines.delay @@ -61,18 +73,6 @@ import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.StateFlow import kotlinx.coroutines.launch import kotlinx.coroutines.suspendCancellableCoroutine -import org.webrtc.AudioSource -import org.webrtc.AudioTrack -import org.webrtc.Camera2Capturer -import org.webrtc.Camera2Enumerator -import org.webrtc.CameraEnumerationAndroid -import org.webrtc.CameraVideoCapturer -import org.webrtc.EglBase -import org.webrtc.MediaStreamTrack -import org.webrtc.ScreenCapturerAndroid -import org.webrtc.SurfaceTextureHelper -import org.webrtc.VideoSource -import org.webrtc.VideoTrack import stream.video.sfu.models.AudioBitrateProfile import stream.video.sfu.models.VideoDimension import java.nio.ByteBuffer diff --git a/stream-video-android-core/src/main/kotlin/io/getstream/video/android/core/StreamVideoBuilder.kt b/stream-video-android-core/src/main/kotlin/io/getstream/video/android/core/StreamVideoBuilder.kt index bc85d2ac778..99fdbde4e4e 100644 --- a/stream-video-android-core/src/main/kotlin/io/getstream/video/android/core/StreamVideoBuilder.kt +++ b/stream-video-android-core/src/main/kotlin/io/getstream/video/android/core/StreamVideoBuilder.kt @@ -49,8 +49,8 @@ import io.getstream.video.android.model.ApiKey import io.getstream.video.android.model.User import io.getstream.video.android.model.UserToken import io.getstream.video.android.model.UserType +import io.getstream.webrtc.ManagedAudioProcessingFactory import kotlinx.coroutines.launch -import org.webrtc.ManagedAudioProcessingFactory import java.net.ConnectException /** diff --git a/stream-video-android-core/src/main/kotlin/io/getstream/video/android/core/StreamVideoClient.kt b/stream-video-android-core/src/main/kotlin/io/getstream/video/android/core/StreamVideoClient.kt index a11aeabeaf6..afe7be87f04 100644 --- a/stream-video-android-core/src/main/kotlin/io/getstream/video/android/core/StreamVideoClient.kt +++ b/stream-video-android-core/src/main/kotlin/io/getstream/video/android/core/StreamVideoClient.kt @@ -126,6 +126,7 @@ import io.getstream.video.android.core.utils.toQueriedMembers import io.getstream.video.android.model.ApiKey import io.getstream.video.android.model.Device import io.getstream.video.android.model.User +import io.getstream.webrtc.ManagedAudioProcessingFactory import kotlinx.coroutines.CoroutineName import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Deferred @@ -144,7 +145,6 @@ import kotlinx.serialization.json.Json import okhttp3.Callback import okhttp3.Request import okhttp3.Response -import org.webrtc.ManagedAudioProcessingFactory import retrofit2.HttpException import java.util.* import kotlin.coroutines.Continuation diff --git a/stream-video-android-core/src/main/kotlin/io/getstream/video/android/core/call/RtcSession.kt b/stream-video-android-core/src/main/kotlin/io/getstream/video/android/core/call/RtcSession.kt index a788b0ab47b..de116862e4d 100644 --- a/stream-video-android-core/src/main/kotlin/io/getstream/video/android/core/call/RtcSession.kt +++ b/stream-video-android-core/src/main/kotlin/io/getstream/video/android/core/call/RtcSession.kt @@ -97,6 +97,11 @@ import io.getstream.video.android.core.utils.defaultConstraints import io.getstream.video.android.core.utils.safeCall import io.getstream.video.android.core.utils.safeCallWithDefault import io.getstream.video.android.core.utils.stringify +import io.getstream.webrtc.MediaStreamTrack +import io.getstream.webrtc.PeerConnection +import io.getstream.webrtc.RTCStatsReport +import io.getstream.webrtc.RtpTransceiver.RtpTransceiverDirection +import io.getstream.webrtc.SessionDescription import kotlinx.coroutines.CompletableJob import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers @@ -126,11 +131,6 @@ import kotlinx.serialization.encodeToString import kotlinx.serialization.json.Json import okio.IOException import org.json.JSONArray -import org.webrtc.MediaStreamTrack -import org.webrtc.PeerConnection -import org.webrtc.RTCStatsReport -import org.webrtc.RtpTransceiver.RtpTransceiverDirection -import org.webrtc.SessionDescription import retrofit2.HttpException import stream.video.sfu.event.JoinRequest import stream.video.sfu.event.LeaveCallRequest @@ -463,7 +463,7 @@ public class RtcSession internal constructor( TrackType.TRACK_TYPE_AUDIO, AudioTrack( streamId = streamId, - audio = track as org.webrtc.AudioTrack, + audio = track as io.getstream.webrtc.AudioTrack, ), ) } @@ -843,7 +843,7 @@ public class RtcSession internal constructor( TrackType.TRACK_TYPE_VIDEO, VideoTrack( streamId = streamId, - video = track as org.webrtc.VideoTrack, + video = track as io.getstream.webrtc.VideoTrack, ), ) } else { @@ -886,7 +886,7 @@ public class RtcSession internal constructor( TrackType.TRACK_TYPE_SCREEN_SHARE, VideoTrack( streamId = streamId, - video = track as org.webrtc.VideoTrack, + video = track as io.getstream.webrtc.VideoTrack, ), ) } diff --git a/stream-video-android-core/src/main/kotlin/io/getstream/video/android/core/call/connection/Publisher.kt b/stream-video-android-core/src/main/kotlin/io/getstream/video/android/core/call/connection/Publisher.kt index ff7ed9062f4..2362021f88f 100644 --- a/stream-video-android-core/src/main/kotlin/io/getstream/video/android/core/call/connection/Publisher.kt +++ b/stream-video-android-core/src/main/kotlin/io/getstream/video/android/core/call/connection/Publisher.kt @@ -42,19 +42,19 @@ import io.getstream.video.android.core.utils.defaultConstraints import io.getstream.video.android.core.utils.iceRestartConstraints import io.getstream.video.android.core.utils.safeCall import io.getstream.video.android.core.utils.safeCallWithDefault +import io.getstream.webrtc.CameraEnumerationAndroid.CaptureFormat +import io.getstream.webrtc.MediaConstraints +import io.getstream.webrtc.MediaStream +import io.getstream.webrtc.MediaStreamTrack +import io.getstream.webrtc.PeerConnection +import io.getstream.webrtc.RtpParameters +import io.getstream.webrtc.RtpTransceiver +import io.getstream.webrtc.RtpTransceiver.RtpTransceiverDirection +import io.getstream.webrtc.RtpTransceiver.RtpTransceiverInit +import io.getstream.webrtc.SessionDescription import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.delay import kotlinx.coroutines.launch -import org.webrtc.CameraEnumerationAndroid.CaptureFormat -import org.webrtc.MediaConstraints -import org.webrtc.MediaStream -import org.webrtc.MediaStreamTrack -import org.webrtc.PeerConnection -import org.webrtc.RtpParameters -import org.webrtc.RtpTransceiver -import org.webrtc.RtpTransceiver.RtpTransceiverDirection -import org.webrtc.RtpTransceiver.RtpTransceiverInit -import org.webrtc.SessionDescription import stream.video.sfu.event.VideoLayerSetting import stream.video.sfu.event.VideoSender import stream.video.sfu.models.ErrorCode diff --git a/stream-video-android-core/src/main/kotlin/io/getstream/video/android/core/call/connection/StreamPeerConnection.kt b/stream-video-android-core/src/main/kotlin/io/getstream/video/android/core/call/connection/StreamPeerConnection.kt index e0fec81afe7..f326d9bc0a8 100644 --- a/stream-video-android-core/src/main/kotlin/io/getstream/video/android/core/call/connection/StreamPeerConnection.kt +++ b/stream-video-android-core/src/main/kotlin/io/getstream/video/android/core/call/connection/StreamPeerConnection.kt @@ -36,25 +36,25 @@ import io.getstream.video.android.core.trace.Tracer import io.getstream.video.android.core.utils.defaultConstraints import io.getstream.video.android.core.utils.safeCall import io.getstream.video.android.core.utils.stringify +import io.getstream.webrtc.CandidatePairChangeEvent +import io.getstream.webrtc.DataChannel +import io.getstream.webrtc.IceCandidateErrorEvent +import io.getstream.webrtc.MediaConstraints +import io.getstream.webrtc.MediaStream +import io.getstream.webrtc.MediaStreamTrack +import io.getstream.webrtc.PeerConnection +import io.getstream.webrtc.RtpParameters +import io.getstream.webrtc.RtpReceiver +import io.getstream.webrtc.RtpTransceiver +import io.getstream.webrtc.RtpTransceiver.RtpTransceiverInit +import io.getstream.webrtc.SessionDescription import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.sync.Mutex import kotlinx.coroutines.sync.withLock -import org.webrtc.CandidatePairChangeEvent -import org.webrtc.DataChannel -import org.webrtc.IceCandidateErrorEvent -import org.webrtc.MediaConstraints -import org.webrtc.MediaStream -import org.webrtc.MediaStreamTrack -import org.webrtc.PeerConnection -import org.webrtc.RtpParameters -import org.webrtc.RtpReceiver -import org.webrtc.RtpTransceiver -import org.webrtc.RtpTransceiver.RtpTransceiverInit -import org.webrtc.SessionDescription import stream.video.sfu.models.TrackType import kotlin.coroutines.resume import kotlin.coroutines.suspendCoroutine -import org.webrtc.IceCandidate as RtcIceCandidate +import io.getstream.webrtc.IceCandidate as RtcIceCandidate /** * Wrapper around the WebRTC connection that contains tracks. @@ -602,7 +602,7 @@ open class StreamPeerConnection( logger.i { "[onIceGatheringChange] #sfu; #$typeTag; newState: $newState" } } - override fun onIceCandidatesRemoved(iceCandidates: Array?) { + override fun onIceCandidatesRemoved(iceCandidates: Array?) { logger.i { "[onIceCandidatesRemoved] #sfu; #$typeTag; iceCandidates: $iceCandidates" } } diff --git a/stream-video-android-core/src/main/kotlin/io/getstream/video/android/core/call/connection/StreamPeerConnectionFactory.kt b/stream-video-android-core/src/main/kotlin/io/getstream/video/android/core/call/connection/StreamPeerConnectionFactory.kt index 2f32bbed181..d8c27683b72 100644 --- a/stream-video-android-core/src/main/kotlin/io/getstream/video/android/core/call/connection/StreamPeerConnectionFactory.kt +++ b/stream-video-android-core/src/main/kotlin/io/getstream/video/android/core/call/connection/StreamPeerConnectionFactory.kt @@ -35,24 +35,24 @@ import io.getstream.video.android.core.model.toPeerType import io.getstream.video.android.core.trace.PeerConnectionTraceKey import io.getstream.video.android.core.trace.Tracer import io.getstream.video.android.core.utils.safeCallWithDefault +import io.getstream.webrtc.AudioSource +import io.getstream.webrtc.AudioTrack +import io.getstream.webrtc.EglBase +import io.getstream.webrtc.Logging +import io.getstream.webrtc.ManagedAudioProcessingFactory +import io.getstream.webrtc.MediaConstraints +import io.getstream.webrtc.MediaStream +import io.getstream.webrtc.MediaStreamTrack +import io.getstream.webrtc.PeerConnection +import io.getstream.webrtc.PeerConnectionFactory +import io.getstream.webrtc.ResolutionAdjustment +import io.getstream.webrtc.RtpCapabilities +import io.getstream.webrtc.SimulcastAlignedVideoEncoderFactory +import io.getstream.webrtc.VideoSource +import io.getstream.webrtc.VideoTrack +import io.getstream.webrtc.audio.JavaAudioDeviceModule +import io.getstream.webrtc.audio.JavaAudioDeviceModule.AudioSamples import kotlinx.coroutines.CoroutineScope -import org.webrtc.AudioSource -import org.webrtc.AudioTrack -import org.webrtc.EglBase -import org.webrtc.Logging -import org.webrtc.ManagedAudioProcessingFactory -import org.webrtc.MediaConstraints -import org.webrtc.MediaStream -import org.webrtc.MediaStreamTrack -import org.webrtc.PeerConnection -import org.webrtc.PeerConnectionFactory -import org.webrtc.ResolutionAdjustment -import org.webrtc.RtpCapabilities -import org.webrtc.SimulcastAlignedVideoEncoderFactory -import org.webrtc.VideoSource -import org.webrtc.VideoTrack -import org.webrtc.audio.JavaAudioDeviceModule -import org.webrtc.audio.JavaAudioDeviceModule.AudioSamples import stream.video.sfu.models.PublishOption import java.nio.ByteBuffer import java.nio.ByteOrder diff --git a/stream-video-android-core/src/main/kotlin/io/getstream/video/android/core/call/connection/Subscriber.kt b/stream-video-android-core/src/main/kotlin/io/getstream/video/android/core/call/connection/Subscriber.kt index eaf48e6159a..f8a16c5dde2 100644 --- a/stream-video-android-core/src/main/kotlin/io/getstream/video/android/core/call/connection/Subscriber.kt +++ b/stream-video-android-core/src/main/kotlin/io/getstream/video/android/core/call/connection/Subscriber.kt @@ -42,6 +42,12 @@ import io.getstream.video.android.core.utils.safeCall import io.getstream.video.android.core.utils.safeCallWithDefault import io.getstream.video.android.core.utils.safeCallWithResult import io.getstream.video.android.core.utils.safeSuspendingCall +import io.getstream.webrtc.MediaConstraints +import io.getstream.webrtc.MediaStream +import io.getstream.webrtc.MediaStreamTrack +import io.getstream.webrtc.PeerConnection +import io.getstream.webrtc.RtpTransceiver +import io.getstream.webrtc.SessionDescription import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Job import kotlinx.coroutines.channels.BufferOverflow @@ -50,12 +56,6 @@ import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.MutableSharedFlow import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.launch -import org.webrtc.MediaConstraints -import org.webrtc.MediaStream -import org.webrtc.MediaStreamTrack -import org.webrtc.PeerConnection -import org.webrtc.RtpTransceiver -import org.webrtc.SessionDescription import stream.video.sfu.models.Participant import stream.video.sfu.models.PeerType import stream.video.sfu.models.TrackType diff --git a/stream-video-android-core/src/main/kotlin/io/getstream/video/android/core/call/connection/coding/SelectiveVideoDecoderFactory.kt b/stream-video-android-core/src/main/kotlin/io/getstream/video/android/core/call/connection/coding/SelectiveVideoDecoderFactory.kt index f0ad4f71940..761627dbc86 100644 --- a/stream-video-android-core/src/main/kotlin/io/getstream/video/android/core/call/connection/coding/SelectiveVideoDecoderFactory.kt +++ b/stream-video-android-core/src/main/kotlin/io/getstream/video/android/core/call/connection/coding/SelectiveVideoDecoderFactory.kt @@ -16,12 +16,12 @@ package io.getstream.video.android.core.call.connection.coding -import org.webrtc.EglBase -import org.webrtc.SoftwareVideoDecoderFactory -import org.webrtc.VideoCodecInfo -import org.webrtc.VideoDecoder -import org.webrtc.VideoDecoderFactory -import org.webrtc.WrappedVideoDecoderFactory +import io.getstream.webrtc.EglBase +import io.getstream.webrtc.SoftwareVideoDecoderFactory +import io.getstream.webrtc.VideoCodecInfo +import io.getstream.webrtc.VideoDecoder +import io.getstream.webrtc.VideoDecoderFactory +import io.getstream.webrtc.WrappedVideoDecoderFactory internal class SelectiveVideoDecoderFactory( sharedContext: EglBase.Context?, diff --git a/stream-video-android-core/src/main/kotlin/io/getstream/video/android/core/call/connection/coding/SelectiveVideoEncoderFactory.kt b/stream-video-android-core/src/main/kotlin/io/getstream/video/android/core/call/connection/coding/SelectiveVideoEncoderFactory.kt index 4456ed4a3b0..194c2111c80 100644 --- a/stream-video-android-core/src/main/kotlin/io/getstream/video/android/core/call/connection/coding/SelectiveVideoEncoderFactory.kt +++ b/stream-video-android-core/src/main/kotlin/io/getstream/video/android/core/call/connection/coding/SelectiveVideoEncoderFactory.kt @@ -16,13 +16,13 @@ package io.getstream.video.android.core.call.connection.coding -import org.webrtc.EglBase -import org.webrtc.ResolutionAdjustment -import org.webrtc.SimulcastAlignedVideoEncoderFactory -import org.webrtc.SoftwareVideoEncoderFactory -import org.webrtc.VideoCodecInfo -import org.webrtc.VideoEncoder -import org.webrtc.VideoEncoderFactory +import io.getstream.webrtc.EglBase +import io.getstream.webrtc.ResolutionAdjustment +import io.getstream.webrtc.SimulcastAlignedVideoEncoderFactory +import io.getstream.webrtc.SoftwareVideoEncoderFactory +import io.getstream.webrtc.VideoCodecInfo +import io.getstream.webrtc.VideoEncoder +import io.getstream.webrtc.VideoEncoderFactory internal class SelectiveVideoEncoderFactory( sharedContext: EglBase.Context?, diff --git a/stream-video-android-core/src/main/kotlin/io/getstream/video/android/core/call/connection/stats/StatsTracer.kt b/stream-video-android-core/src/main/kotlin/io/getstream/video/android/core/call/connection/stats/StatsTracer.kt index aee33141529..5eebe0ee3e0 100644 --- a/stream-video-android-core/src/main/kotlin/io/getstream/video/android/core/call/connection/stats/StatsTracer.kt +++ b/stream-video-android-core/src/main/kotlin/io/getstream/video/android/core/call/connection/stats/StatsTracer.kt @@ -21,10 +21,10 @@ import io.getstream.video.android.core.call.stats.toRtcInboundRtpVideoStreamStat import io.getstream.video.android.core.call.stats.toRtcOutboundRtpVideoStreamStats import io.getstream.video.android.core.call.stats.toRtcVideoSourceStats import io.getstream.video.android.core.internal.InternalStreamVideoApi +import io.getstream.webrtc.PeerConnection +import io.getstream.webrtc.RTCStats +import io.getstream.webrtc.RTCStatsReport import kotlinx.coroutines.suspendCancellableCoroutine -import org.webrtc.PeerConnection -import org.webrtc.RTCStats -import org.webrtc.RTCStatsReport import stream.video.sfu.models.Codec import stream.video.sfu.models.PeerType import stream.video.sfu.models.PerformanceStats diff --git a/stream-video-android-core/src/main/kotlin/io/getstream/video/android/core/call/connection/transceivers/TransceiverCache.kt b/stream-video-android-core/src/main/kotlin/io/getstream/video/android/core/call/connection/transceivers/TransceiverCache.kt index f90d5ede4b4..36ea25d9b51 100644 --- a/stream-video-android-core/src/main/kotlin/io/getstream/video/android/core/call/connection/transceivers/TransceiverCache.kt +++ b/stream-video-android-core/src/main/kotlin/io/getstream/video/android/core/call/connection/transceivers/TransceiverCache.kt @@ -17,7 +17,7 @@ package io.getstream.video.android.core.call.connection.transceivers import io.getstream.video.android.core.call.connection.utils.OptimalVideoLayer -import org.webrtc.RtpTransceiver +import io.getstream.webrtc.RtpTransceiver import stream.video.sfu.models.PublishOption import stream.video.sfu.models.TrackType import java.util.Collections diff --git a/stream-video-android-core/src/main/kotlin/io/getstream/video/android/core/call/connection/utils/VideoCodecScalabilityChecker.kt b/stream-video-android-core/src/main/kotlin/io/getstream/video/android/core/call/connection/utils/VideoCodecScalabilityChecker.kt index 5d6a44c862c..d7cc47c7914 100644 --- a/stream-video-android-core/src/main/kotlin/io/getstream/video/android/core/call/connection/utils/VideoCodecScalabilityChecker.kt +++ b/stream-video-android-core/src/main/kotlin/io/getstream/video/android/core/call/connection/utils/VideoCodecScalabilityChecker.kt @@ -17,14 +17,14 @@ package io.getstream.video.android.core.call.connection.utils import android.util.Log -import org.webrtc.DefaultVideoEncoderFactory -import org.webrtc.EglBase -import org.webrtc.HardwareVideoEncoderFactory -import org.webrtc.ResolutionAdjustment -import org.webrtc.SimulcastAlignedVideoEncoderFactory -import org.webrtc.SoftwareVideoEncoderFactory -import org.webrtc.VideoCodecInfo -import org.webrtc.VideoEncoderFactory +import io.getstream.webrtc.DefaultVideoEncoderFactory +import io.getstream.webrtc.EglBase +import io.getstream.webrtc.HardwareVideoEncoderFactory +import io.getstream.webrtc.ResolutionAdjustment +import io.getstream.webrtc.SimulcastAlignedVideoEncoderFactory +import io.getstream.webrtc.SoftwareVideoEncoderFactory +import io.getstream.webrtc.VideoCodecInfo +import io.getstream.webrtc.VideoEncoderFactory /** * Utility class to check video codec scalability modes on Android devices diff --git a/stream-video-android-core/src/main/kotlin/io/getstream/video/android/core/call/connection/utils/VideoLayers.kt b/stream-video-android-core/src/main/kotlin/io/getstream/video/android/core/call/connection/utils/VideoLayers.kt index aa8f437209d..f24ece55f57 100644 --- a/stream-video-android-core/src/main/kotlin/io/getstream/video/android/core/call/connection/utils/VideoLayers.kt +++ b/stream-video-android-core/src/main/kotlin/io/getstream/video/android/core/call/connection/utils/VideoLayers.kt @@ -18,8 +18,8 @@ package io.getstream.video.android.core.call.connection.utils import io.getstream.log.StreamLog import io.getstream.log.taggedLogger -import org.webrtc.CameraEnumerationAndroid.CaptureFormat -import org.webrtc.RtpParameters +import io.getstream.webrtc.CameraEnumerationAndroid.CaptureFormat +import io.getstream.webrtc.RtpParameters import stream.video.sfu.models.AudioBitrateProfile import stream.video.sfu.models.PublishOption import stream.video.sfu.models.TrackType diff --git a/stream-video-android-core/src/main/kotlin/io/getstream/video/android/core/call/stats/RtcMapper.kt b/stream-video-android-core/src/main/kotlin/io/getstream/video/android/core/call/stats/RtcMapper.kt index a3843ef35c0..de841454dd2 100644 --- a/stream-video-android-core/src/main/kotlin/io/getstream/video/android/core/call/stats/RtcMapper.kt +++ b/stream-video-android-core/src/main/kotlin/io/getstream/video/android/core/call/stats/RtcMapper.kt @@ -44,8 +44,8 @@ import io.getstream.video.android.core.call.stats.model.RtcVideoSourceStats import io.getstream.video.android.core.call.stats.model.discriminator.RtcMediaKind import io.getstream.video.android.core.call.stats.model.discriminator.RtcQualityLimitationReason import io.getstream.video.android.core.call.stats.model.discriminator.RtcReportType -import org.webrtc.RTCStats -import org.webrtc.RTCStatsReport +import io.getstream.webrtc.RTCStats +import io.getstream.webrtc.RTCStatsReport private const val TAG = "RtcParser" private const val DEBUG = false diff --git a/stream-video-android-core/src/main/kotlin/io/getstream/video/android/core/call/stats/model/RtcStatsReport.kt b/stream-video-android-core/src/main/kotlin/io/getstream/video/android/core/call/stats/model/RtcStatsReport.kt index 48bf1c69d07..41573553612 100644 --- a/stream-video-android-core/src/main/kotlin/io/getstream/video/android/core/call/stats/model/RtcStatsReport.kt +++ b/stream-video-android-core/src/main/kotlin/io/getstream/video/android/core/call/stats/model/RtcStatsReport.kt @@ -17,7 +17,7 @@ package io.getstream.video.android.core.call.stats.model import io.getstream.video.android.core.call.stats.model.discriminator.RtcReportType -import org.webrtc.RTCStatsReport +import io.getstream.webrtc.RTCStatsReport data class RtcStatsReport( val origin: RTCStatsReport, diff --git a/stream-video-android-core/src/main/kotlin/io/getstream/video/android/core/call/utils/PeerConnection.kt b/stream-video-android-core/src/main/kotlin/io/getstream/video/android/core/call/utils/PeerConnection.kt index 4a8e6cc9b79..0f60824c994 100644 --- a/stream-video-android-core/src/main/kotlin/io/getstream/video/android/core/call/utils/PeerConnection.kt +++ b/stream-video-android-core/src/main/kotlin/io/getstream/video/android/core/call/utils/PeerConnection.kt @@ -20,9 +20,9 @@ import io.getstream.result.Error import io.getstream.result.Result import io.getstream.result.Result.Failure import io.getstream.result.Result.Success -import org.webrtc.AddIceObserver -import org.webrtc.IceCandidate -import org.webrtc.PeerConnection +import io.getstream.webrtc.AddIceObserver +import io.getstream.webrtc.IceCandidate +import io.getstream.webrtc.PeerConnection import kotlin.coroutines.resume import kotlin.coroutines.suspendCoroutine diff --git a/stream-video-android-core/src/main/kotlin/io/getstream/video/android/core/call/utils/SDPUtils.kt b/stream-video-android-core/src/main/kotlin/io/getstream/video/android/core/call/utils/SDPUtils.kt index e565e425ddb..031210eb6d3 100644 --- a/stream-video-android-core/src/main/kotlin/io/getstream/video/android/core/call/utils/SDPUtils.kt +++ b/stream-video-android-core/src/main/kotlin/io/getstream/video/android/core/call/utils/SDPUtils.kt @@ -20,8 +20,8 @@ import io.getstream.result.Error import io.getstream.result.Result import io.getstream.result.Result.Failure import io.getstream.result.Result.Success -import org.webrtc.SdpObserver -import org.webrtc.SessionDescription +import io.getstream.webrtc.SdpObserver +import io.getstream.webrtc.SessionDescription import kotlin.coroutines.resume import kotlin.coroutines.suspendCoroutine diff --git a/stream-video-android-core/src/main/kotlin/io/getstream/video/android/core/call/utils/Stringify.kt b/stream-video-android-core/src/main/kotlin/io/getstream/video/android/core/call/utils/Stringify.kt index 16c992aca92..d5fcafb8a12 100644 --- a/stream-video-android-core/src/main/kotlin/io/getstream/video/android/core/call/utils/Stringify.kt +++ b/stream-video-android-core/src/main/kotlin/io/getstream/video/android/core/call/utils/Stringify.kt @@ -16,10 +16,10 @@ package io.getstream.video.android.core.call.utils -import org.webrtc.IceCandidateErrorEvent -import org.webrtc.MediaStreamTrack -import org.webrtc.SessionDescription -import org.webrtc.audio.JavaAudioDeviceModule +import io.getstream.webrtc.IceCandidateErrorEvent +import io.getstream.webrtc.MediaStreamTrack +import io.getstream.webrtc.SessionDescription +import io.getstream.webrtc.audio.JavaAudioDeviceModule import stream.video.sfu.models.PeerType @JvmSynthetic diff --git a/stream-video-android-core/src/main/kotlin/io/getstream/video/android/core/call/video/FilterVideoProcessor.kt b/stream-video-android-core/src/main/kotlin/io/getstream/video/android/core/call/video/FilterVideoProcessor.kt index 88839d2d8f8..9ee3f342e25 100644 --- a/stream-video-android-core/src/main/kotlin/io/getstream/video/android/core/call/video/FilterVideoProcessor.kt +++ b/stream-video-android-core/src/main/kotlin/io/getstream/video/android/core/call/video/FilterVideoProcessor.kt @@ -21,12 +21,12 @@ import android.graphics.Matrix import android.opengl.GLES20 import android.opengl.GLUtils import androidx.core.graphics.get -import org.webrtc.SurfaceTextureHelper -import org.webrtc.TextureBufferImpl -import org.webrtc.VideoFrame -import org.webrtc.VideoProcessor -import org.webrtc.VideoSink -import org.webrtc.YuvConverter +import io.getstream.webrtc.SurfaceTextureHelper +import io.getstream.webrtc.TextureBufferImpl +import io.getstream.webrtc.VideoFrame +import io.getstream.webrtc.VideoProcessor +import io.getstream.webrtc.VideoSink +import io.getstream.webrtc.YuvConverter import kotlin.getValue internal class FilterVideoProcessor( diff --git a/stream-video-android-core/src/main/kotlin/io/getstream/video/android/core/call/video/VideoFilter.kt b/stream-video-android-core/src/main/kotlin/io/getstream/video/android/core/call/video/VideoFilter.kt index c5baabd83bd..38499feacc7 100644 --- a/stream-video-android-core/src/main/kotlin/io/getstream/video/android/core/call/video/VideoFilter.kt +++ b/stream-video-android-core/src/main/kotlin/io/getstream/video/android/core/call/video/VideoFilter.kt @@ -17,8 +17,8 @@ package io.getstream.video.android.core.call.video import android.graphics.Bitmap -import org.webrtc.SurfaceTextureHelper -import org.webrtc.VideoFrame +import io.getstream.webrtc.SurfaceTextureHelper +import io.getstream.webrtc.VideoFrame /** * Do not create instances directly. Use [BitmapVideoFilter] or [RawVideoFilter] diff --git a/stream-video-android-core/src/main/kotlin/io/getstream/video/android/core/call/video/YuvFrame.kt b/stream-video-android-core/src/main/kotlin/io/getstream/video/android/core/call/video/YuvFrame.kt index f97151effc1..b1ab6b779d5 100644 --- a/stream-video-android-core/src/main/kotlin/io/getstream/video/android/core/call/video/YuvFrame.kt +++ b/stream-video-android-core/src/main/kotlin/io/getstream/video/android/core/call/video/YuvFrame.kt @@ -18,12 +18,12 @@ package io.getstream.video.android.core.call.video import android.graphics.Bitmap import io.getstream.log.taggedLogger +import io.getstream.webrtc.VideoFrame import io.github.crow_misia.libyuv.AbgrBuffer import io.github.crow_misia.libyuv.I420Buffer import io.github.crow_misia.libyuv.PlanePrimitive import io.github.crow_misia.libyuv.RotateMode import io.github.crow_misia.libyuv.RowStride -import org.webrtc.VideoFrame // TODO: should be an internal class instead of object object YuvFrame { diff --git a/stream-video-android-core/src/main/kotlin/io/getstream/video/android/core/model/IceCandidate.kt b/stream-video-android-core/src/main/kotlin/io/getstream/video/android/core/model/IceCandidate.kt index 98aada38bc8..6bad80afd66 100644 --- a/stream-video-android-core/src/main/kotlin/io/getstream/video/android/core/model/IceCandidate.kt +++ b/stream-video-android-core/src/main/kotlin/io/getstream/video/android/core/model/IceCandidate.kt @@ -17,7 +17,7 @@ package io.getstream.video.android.core.model import androidx.compose.runtime.Stable -import org.webrtc.IceCandidate as RtcIceCandidate +import io.getstream.webrtc.IceCandidate as RtcIceCandidate @Stable @kotlinx.serialization.Serializable @@ -38,7 +38,7 @@ internal fun RtcIceCandidate.toDomainCandidate(): IceCandidate { } internal fun IceCandidate.toRtcCandidate(): RtcIceCandidate { - return org.webrtc.IceCandidate( + return io.getstream.webrtc.IceCandidate( sdpMid, sdpMLineIndex, candidate, diff --git a/stream-video-android-core/src/main/kotlin/io/getstream/video/android/core/model/MediaTrack.kt b/stream-video-android-core/src/main/kotlin/io/getstream/video/android/core/model/MediaTrack.kt index 6763cd5db26..3738be35f2c 100644 --- a/stream-video-android-core/src/main/kotlin/io/getstream/video/android/core/model/MediaTrack.kt +++ b/stream-video-android-core/src/main/kotlin/io/getstream/video/android/core/model/MediaTrack.kt @@ -42,11 +42,11 @@ public sealed class MediaTrack( @Stable public data class VideoTrack( public override val streamId: String, - public val video: org.webrtc.VideoTrack, + public val video: io.getstream.webrtc.VideoTrack, ) : MediaTrack(streamId) @Stable public data class AudioTrack( public override val streamId: String, - public val audio: org.webrtc.AudioTrack, + public val audio: io.getstream.webrtc.AudioTrack, ) : MediaTrack(streamId) diff --git a/stream-video-android-core/src/main/kotlin/io/getstream/video/android/core/utils/CallClientUtils.kt b/stream-video-android-core/src/main/kotlin/io/getstream/video/android/core/utils/CallClientUtils.kt index 68940b9c139..850a0b915fb 100644 --- a/stream-video-android-core/src/main/kotlin/io/getstream/video/android/core/utils/CallClientUtils.kt +++ b/stream-video-android-core/src/main/kotlin/io/getstream/video/android/core/utils/CallClientUtils.kt @@ -17,9 +17,9 @@ package io.getstream.video.android.core.utils import io.getstream.video.android.core.model.IceServer -import org.webrtc.MediaConstraints -import org.webrtc.PeerConnection -import org.webrtc.SessionDescription +import io.getstream.webrtc.MediaConstraints +import io.getstream.webrtc.PeerConnection +import io.getstream.webrtc.SessionDescription import stream.video.sfu.models.AudioBitrateProfile data class RtpMapAttribute(val index: Int, val number: String, val codec: String, val line: String) diff --git a/stream-video-android-core/src/main/kotlin/io/getstream/webrtc/android/ui/VideoTextureViewRenderer.kt b/stream-video-android-core/src/main/kotlin/io/getstream/webrtc/android/ui/VideoTextureViewRenderer.kt index f80248100ec..a7f5568ac4b 100644 --- a/stream-video-android-core/src/main/kotlin/io/getstream/webrtc/android/ui/VideoTextureViewRenderer.kt +++ b/stream-video-android-core/src/main/kotlin/io/getstream/webrtc/android/ui/VideoTextureViewRenderer.kt @@ -24,13 +24,13 @@ import android.os.Handler import android.os.Looper import android.util.AttributeSet import android.view.TextureView -import org.webrtc.EglBase -import org.webrtc.EglRenderer -import org.webrtc.GlRectDrawer -import org.webrtc.RendererCommon -import org.webrtc.ThreadUtils -import org.webrtc.VideoFrame -import org.webrtc.VideoSink +import io.getstream.webrtc.EglBase +import io.getstream.webrtc.EglRenderer +import io.getstream.webrtc.GlRectDrawer +import io.getstream.webrtc.RendererCommon +import io.getstream.webrtc.ThreadUtils +import io.getstream.webrtc.VideoFrame +import io.getstream.webrtc.VideoSink import java.util.concurrent.CountDownLatch /** @@ -72,17 +72,17 @@ public open class VideoTextureViewRenderer @JvmOverloads constructor( private var isFirstFrameRendered = false /** - * The rotated [org.webrtc.VideoFrame] width. + * The rotated [io.getstream.webrtc.VideoFrame] width. */ private var rotatedFrameWidth = 0 /** - * The rotated [org.webrtc.VideoFrame] height. + * The rotated [io.getstream.webrtc.VideoFrame] height. */ private var rotatedFrameHeight = 0 /** - * The rotated [org.webrtc.VideoFrame] rotation. + * The rotated [io.getstream.webrtc.VideoFrame] rotation. */ private var frameRotation = 0 @@ -126,7 +126,7 @@ public open class VideoTextureViewRenderer @JvmOverloads constructor( /** * Called when a new frame is received. Sends the frame to be rendered. * - * @param videoFrame The [org.webrtc.VideoFrame] received from WebRTC connection to draw on the screen. + * @param videoFrame The [io.getstream.webrtc.VideoFrame] received from WebRTC connection to draw on the screen. */ override fun onFrame(videoFrame: VideoFrame) { eglRenderer.onFrame(videoFrame) @@ -181,7 +181,7 @@ public open class VideoTextureViewRenderer @JvmOverloads constructor( /** * Initialise the renderer. Should be called from the main thread. * - * @param sharedContext [org.webrtc.EglBase.Context] + * @param sharedContext [io.getstream.webrtc.EglBase.Context] * @param rendererEvents Sets the render event listener. */ public fun init( diff --git a/stream-video-android-core/src/test/kotlin/io/getstream/video/android/core/CameraManagerTest.kt b/stream-video-android-core/src/test/kotlin/io/getstream/video/android/core/CameraManagerTest.kt index f355bf5b17a..afb43bcaac7 100644 --- a/stream-video-android-core/src/test/kotlin/io/getstream/video/android/core/CameraManagerTest.kt +++ b/stream-video-android-core/src/test/kotlin/io/getstream/video/android/core/CameraManagerTest.kt @@ -18,12 +18,12 @@ package io.getstream.video.android.core import android.hardware.camera2.CameraCharacteristics import io.getstream.video.android.core.camera.CameraCharacteristicsValidator +import io.getstream.webrtc.Camera2Enumerator +import io.getstream.webrtc.CameraEnumerationAndroid.CaptureFormat +import io.getstream.webrtc.EglBase import io.mockk.every import io.mockk.mockk import org.junit.Test -import org.webrtc.Camera2Enumerator -import org.webrtc.CameraEnumerationAndroid.CaptureFormat -import org.webrtc.EglBase import kotlin.test.assertEquals class CameraManagerTest { diff --git a/stream-video-android-core/src/test/kotlin/io/getstream/video/android/core/SdpTest.kt b/stream-video-android-core/src/test/kotlin/io/getstream/video/android/core/SdpTest.kt index d70e15a87d6..d519b281681 100644 --- a/stream-video-android-core/src/test/kotlin/io/getstream/video/android/core/SdpTest.kt +++ b/stream-video-android-core/src/test/kotlin/io/getstream/video/android/core/SdpTest.kt @@ -20,11 +20,11 @@ import com.google.common.truth.Truth.assertThat import io.getstream.video.android.core.base.TestBase import io.getstream.video.android.core.utils.MinimalSdpParser import io.getstream.video.android.core.utils.mangleSdpUtil +import io.getstream.webrtc.SessionDescription import kotlinx.coroutines.test.runTest import org.junit.Test import org.junit.runner.RunWith import org.robolectric.RobolectricTestRunner -import org.webrtc.SessionDescription @RunWith(RobolectricTestRunner::class) class SdpTest : TestBase() { diff --git a/stream-video-android-core/src/test/kotlin/io/getstream/video/android/core/call/connection/PublisherTest.kt b/stream-video-android-core/src/test/kotlin/io/getstream/video/android/core/call/connection/PublisherTest.kt index ca1f4ad3505..a44e4f0377e 100644 --- a/stream-video-android-core/src/test/kotlin/io/getstream/video/android/core/call/connection/PublisherTest.kt +++ b/stream-video-android-core/src/test/kotlin/io/getstream/video/android/core/call/connection/PublisherTest.kt @@ -23,6 +23,17 @@ import io.getstream.video.android.core.api.SignalServerService import io.getstream.video.android.core.call.connection.transceivers.TransceiverCache import io.getstream.video.android.core.call.connection.transceivers.TransceiverId import io.getstream.video.android.core.model.StreamPeerType +import io.getstream.webrtc.AudioTrack +import io.getstream.webrtc.CameraEnumerationAndroid +import io.getstream.webrtc.MediaConstraints +import io.getstream.webrtc.MediaStreamTrack +import io.getstream.webrtc.PeerConnection +import io.getstream.webrtc.RtpParameters +import io.getstream.webrtc.RtpParameters.HeaderExtension +import io.getstream.webrtc.RtpSender +import io.getstream.webrtc.RtpTransceiver +import io.getstream.webrtc.SessionDescription +import io.getstream.webrtc.VideoTrack import io.mockk.MockKAnnotations import io.mockk.coEvery import io.mockk.coVerify @@ -46,17 +57,6 @@ import org.junit.Assert.assertNotNull import org.junit.Assert.assertNull import org.junit.Before import org.junit.Test -import org.webrtc.AudioTrack -import org.webrtc.CameraEnumerationAndroid -import org.webrtc.MediaConstraints -import org.webrtc.MediaStreamTrack -import org.webrtc.PeerConnection -import org.webrtc.RtpParameters -import org.webrtc.RtpParameters.HeaderExtension -import org.webrtc.RtpSender -import org.webrtc.RtpTransceiver -import org.webrtc.SessionDescription -import org.webrtc.VideoTrack import stream.video.sfu.event.VideoLayerSetting import stream.video.sfu.event.VideoSender import stream.video.sfu.models.AudioBitrateProfile diff --git a/stream-video-android-core/src/test/kotlin/io/getstream/video/android/core/call/connection/StreamPeerConnectionFactoryTest.kt b/stream-video-android-core/src/test/kotlin/io/getstream/video/android/core/call/connection/StreamPeerConnectionFactoryTest.kt index edcfbd7a5ec..21cbede278a 100644 --- a/stream-video-android-core/src/test/kotlin/io/getstream/video/android/core/call/connection/StreamPeerConnectionFactoryTest.kt +++ b/stream-video-android-core/src/test/kotlin/io/getstream/video/android/core/call/connection/StreamPeerConnectionFactoryTest.kt @@ -20,6 +20,12 @@ import android.content.Context import io.getstream.video.android.core.MediaManagerImpl import io.getstream.video.android.core.ParticipantState import io.getstream.video.android.core.api.SignalServerService +import io.getstream.webrtc.EglBase +import io.getstream.webrtc.ManagedAudioProcessingFactory +import io.getstream.webrtc.MediaConstraints +import io.getstream.webrtc.PeerConnection +import io.getstream.webrtc.PeerConnection.Observer +import io.getstream.webrtc.PeerConnectionFactory import io.mockk.MockKAnnotations import io.mockk.every import io.mockk.impl.annotations.RelaxedMockK @@ -35,12 +41,6 @@ import kotlinx.coroutines.test.TestScope import org.junit.After import org.junit.Before import org.junit.Test -import org.webrtc.EglBase -import org.webrtc.ManagedAudioProcessingFactory -import org.webrtc.MediaConstraints -import org.webrtc.PeerConnection -import org.webrtc.PeerConnection.Observer -import org.webrtc.PeerConnectionFactory import stream.video.sfu.models.PublishOption class StreamPeerConnectionFactoryTest { diff --git a/stream-video-android-core/src/test/kotlin/io/getstream/video/android/core/call/connection/StreamPeerConnectionTest.kt b/stream-video-android-core/src/test/kotlin/io/getstream/video/android/core/call/connection/StreamPeerConnectionTest.kt index b86043c851d..3b219346e6a 100644 --- a/stream-video-android-core/src/test/kotlin/io/getstream/video/android/core/call/connection/StreamPeerConnectionTest.kt +++ b/stream-video-android-core/src/test/kotlin/io/getstream/video/android/core/call/connection/StreamPeerConnectionTest.kt @@ -18,6 +18,13 @@ package io.getstream.video.android.core.call.connection import io.getstream.result.Result import io.getstream.video.android.core.model.StreamPeerType +import io.getstream.webrtc.MediaConstraints +import io.getstream.webrtc.PeerConnection +import io.getstream.webrtc.RtpParameters.Encoding +import io.getstream.webrtc.RtpTransceiver.RtpTransceiverDirection +import io.getstream.webrtc.RtpTransceiver.RtpTransceiverInit +import io.getstream.webrtc.SdpObserver +import io.getstream.webrtc.SessionDescription import io.mockk.MockKAnnotations import io.mockk.Runs import io.mockk.clearAllMocks @@ -34,13 +41,6 @@ import kotlinx.coroutines.test.TestScope import kotlinx.coroutines.test.runTest import org.junit.After import org.junit.Before -import org.webrtc.MediaConstraints -import org.webrtc.PeerConnection -import org.webrtc.RtpParameters.Encoding -import org.webrtc.RtpTransceiver.RtpTransceiverDirection -import org.webrtc.RtpTransceiver.RtpTransceiverInit -import org.webrtc.SdpObserver -import org.webrtc.SessionDescription import kotlin.test.Test class StreamPeerConnectionTest { @@ -160,7 +160,7 @@ class StreamPeerConnectionTest { // We'll create a StreamPeerConnection with a known maxBitRate val peerConnection = object : StreamPeerConnection( type = io.getstream.video.android.core.model.StreamPeerType.PUBLISHER, - mediaConstraints = org.webrtc.MediaConstraints(), + mediaConstraints = io.getstream.webrtc.MediaConstraints(), onStreamAdded = null, onNegotiationNeeded = null, onIceCandidate = null, @@ -215,7 +215,7 @@ class StreamPeerConnectionTest { fun `buildVideoTransceiverInit screenshare has one encoding q`() = runTest { val peerConnection = object : StreamPeerConnection( type = io.getstream.video.android.core.model.StreamPeerType.SUBSCRIBER, - mediaConstraints = org.webrtc.MediaConstraints(), + mediaConstraints = io.getstream.webrtc.MediaConstraints(), onStreamAdded = null, onNegotiationNeeded = null, onIceCandidate = null, diff --git a/stream-video-android-core/src/test/kotlin/io/getstream/video/android/core/call/connection/SubscriberTest.kt b/stream-video-android-core/src/test/kotlin/io/getstream/video/android/core/call/connection/SubscriberTest.kt index 5339eb74b8c..7b4e80e43cd 100644 --- a/stream-video-android-core/src/test/kotlin/io/getstream/video/android/core/call/connection/SubscriberTest.kt +++ b/stream-video-android-core/src/test/kotlin/io/getstream/video/android/core/call/connection/SubscriberTest.kt @@ -24,6 +24,13 @@ import io.getstream.video.android.core.internal.module.SfuConnectionModule import io.getstream.video.android.core.model.AudioTrack import io.getstream.video.android.core.trace.Tracer import io.getstream.video.android.core.trySetEnabled +import io.getstream.webrtc.MediaStream +import io.getstream.webrtc.MediaStreamTrack +import io.getstream.webrtc.PeerConnection +import io.getstream.webrtc.RtpReceiver +import io.getstream.webrtc.RtpTransceiver +import io.getstream.webrtc.SessionDescription +import io.getstream.webrtc.VideoTrack import io.mockk.MockKAnnotations import io.mockk.coEvery import io.mockk.coVerify @@ -46,18 +53,11 @@ import org.junit.Assert.assertTrue import org.junit.Before import org.junit.Test import org.robolectric.shadows.ShadowTrace.setEnabled -import org.webrtc.MediaStream -import org.webrtc.MediaStreamTrack -import org.webrtc.PeerConnection -import org.webrtc.RtpReceiver -import org.webrtc.RtpTransceiver -import org.webrtc.SessionDescription -import org.webrtc.VideoTrack import stream.video.sfu.models.PeerType import stream.video.sfu.models.TrackType import stream.video.sfu.signal.ICERestartRequest import stream.video.sfu.signal.UpdateSubscriptionsResponse -import org.webrtc.AudioTrack as RtcAudioTrack +import io.getstream.webrtc.AudioTrack as RtcAudioTrack @OptIn(ExperimentalCoroutinesApi::class) class SubscriberTest { @@ -81,18 +81,22 @@ class SubscriberTest { override fun getId(): String { return mockedId } - override fun addTrack(track: org.webrtc.AudioTrack?): Boolean { + override fun addTrack(track: io.getstream.webrtc.AudioTrack?): Boolean { val audioTracksField = MediaStream::class.java.getDeclaredField("audioTracks") audioTracksField.isAccessible = true - val audioTracks = audioTracksField.get(this) as MutableList + val audioTracks = audioTracksField.get( + this, + ) as MutableList audioTracks.add(track!!) return true } - override fun addTrack(track: org.webrtc.VideoTrack?): Boolean { + override fun addTrack(track: io.getstream.webrtc.VideoTrack?): Boolean { val videoTracksField = MediaStream::class.java.getDeclaredField("videoTracks") videoTracksField.isAccessible = true - val videoTracks = videoTracksField.get(this) as MutableList + val videoTracks = videoTracksField.get( + this, + ) as MutableList videoTracks.add(track!!) return true } @@ -315,7 +319,7 @@ class SubscriberTest { @Test fun `onNewStream adds audio and video tracks to internal maps`() = runTest { val sessionId = "session-id" - val audioTrack = mockk(relaxed = true) + val audioTrack = mockk(relaxed = true) val videoTrack = mockk(relaxed = true) subscriber.setTrackLookupPrefixes( mapOf( @@ -370,7 +374,7 @@ class SubscriberTest { @Test fun `onNewStream populates trackIdToParticipant correctly`() = runTest { val sessionId = "session-id" - val audioTrack = mockk(relaxed = true) { + val audioTrack = mockk(relaxed = true) { every { id() } returns "audio-id" } val videoTrack = mockk(relaxed = true) { @@ -399,7 +403,7 @@ class SubscriberTest { fun `onRemoveStream removes tracks from internal tracking maps`() = runTest { val sessionId = "session-id" val trackId = "audio-track-id" - val audioTrack = mockk(relaxed = true) { + val audioTrack = mockk(relaxed = true) { every { id() } returns trackId } diff --git a/stream-video-android-core/src/test/kotlin/io/getstream/video/android/core/call/connection/coding/SelectiveVideoDecoderFactoryTest.kt b/stream-video-android-core/src/test/kotlin/io/getstream/video/android/core/call/connection/coding/SelectiveVideoDecoderFactoryTest.kt index eb6e836b22b..e8774c64dab 100644 --- a/stream-video-android-core/src/test/kotlin/io/getstream/video/android/core/call/connection/coding/SelectiveVideoDecoderFactoryTest.kt +++ b/stream-video-android-core/src/test/kotlin/io/getstream/video/android/core/call/connection/coding/SelectiveVideoDecoderFactoryTest.kt @@ -17,6 +17,10 @@ package io.getstream.video.android.core.call.connection.coding import androidx.core.content.ContextCompat +import io.getstream.webrtc.SoftwareVideoDecoderFactory +import io.getstream.webrtc.VideoCodecInfo +import io.getstream.webrtc.VideoDecoder +import io.getstream.webrtc.WrappedVideoDecoderFactory import io.mockk.clearAllMocks import io.mockk.every import io.mockk.mockk @@ -28,10 +32,6 @@ import org.junit.Before import org.junit.Test import org.junit.runner.RunWith import org.robolectric.RobolectricTestRunner -import org.webrtc.SoftwareVideoDecoderFactory -import org.webrtc.VideoCodecInfo -import org.webrtc.VideoDecoder -import org.webrtc.WrappedVideoDecoderFactory @RunWith(RobolectricTestRunner::class) class SelectiveVideoDecoderFactoryTest { diff --git a/stream-video-android-core/src/test/kotlin/io/getstream/video/android/core/call/connection/stats/StatsTracerTest.kt b/stream-video-android-core/src/test/kotlin/io/getstream/video/android/core/call/connection/stats/StatsTracerTest.kt index d979389d2e8..7d83d8b827b 100644 --- a/stream-video-android-core/src/test/kotlin/io/getstream/video/android/core/call/connection/stats/StatsTracerTest.kt +++ b/stream-video-android-core/src/test/kotlin/io/getstream/video/android/core/call/connection/stats/StatsTracerTest.kt @@ -16,6 +16,10 @@ package io.getstream.video.android.core.call.connection.stats +import io.getstream.webrtc.PeerConnection +import io.getstream.webrtc.RTCStats +import io.getstream.webrtc.RTCStatsCollectorCallback +import io.getstream.webrtc.RTCStatsReport import io.mockk.MockKAnnotations import io.mockk.every import io.mockk.mockk @@ -27,10 +31,6 @@ import org.junit.Assert.assertNotNull import org.junit.Assert.assertTrue import org.junit.Before import org.junit.Test -import org.webrtc.PeerConnection -import org.webrtc.RTCStats -import org.webrtc.RTCStatsCollectorCallback -import org.webrtc.RTCStatsReport import stream.video.sfu.models.PeerType import stream.video.sfu.models.TrackType diff --git a/stream-video-android-core/src/test/kotlin/io/getstream/video/android/core/call/connection/transceivers/TransceiverCacheTest.kt b/stream-video-android-core/src/test/kotlin/io/getstream/video/android/core/call/connection/transceivers/TransceiverCacheTest.kt index 8b6d46d506d..4d1febe2419 100644 --- a/stream-video-android-core/src/test/kotlin/io/getstream/video/android/core/call/connection/transceivers/TransceiverCacheTest.kt +++ b/stream-video-android-core/src/test/kotlin/io/getstream/video/android/core/call/connection/transceivers/TransceiverCacheTest.kt @@ -17,6 +17,9 @@ package io.getstream.video.android.core.call.connection.transceivers import io.getstream.video.android.core.call.connection.utils.OptimalVideoLayer +import io.getstream.webrtc.RtpReceiver +import io.getstream.webrtc.RtpSender +import io.getstream.webrtc.RtpTransceiver import io.mockk.MockKAnnotations import io.mockk.every import io.mockk.impl.annotations.MockK @@ -28,9 +31,6 @@ import org.junit.Assert.assertNull import org.junit.Assert.assertTrue import org.junit.Before import org.junit.Test -import org.webrtc.RtpReceiver -import org.webrtc.RtpSender -import org.webrtc.RtpTransceiver import stream.video.sfu.models.PublishOption import stream.video.sfu.models.TrackType import stream.video.sfu.models.VideoDimension diff --git a/stream-video-android-core/src/test/kotlin/io/getstream/video/android/core/call/connection/utils/VideoLayersTest.kt b/stream-video-android-core/src/test/kotlin/io/getstream/video/android/core/call/connection/utils/VideoLayersTest.kt index 0d2f6656bf4..f975dbb473f 100644 --- a/stream-video-android-core/src/test/kotlin/io/getstream/video/android/core/call/connection/utils/VideoLayersTest.kt +++ b/stream-video-android-core/src/test/kotlin/io/getstream/video/android/core/call/connection/utils/VideoLayersTest.kt @@ -16,6 +16,7 @@ package io.getstream.video.android.core.call.connection.utils +import io.getstream.webrtc.CameraEnumerationAndroid import io.mockk.every import io.mockk.mockk import kotlinx.coroutines.test.runTest @@ -25,7 +26,6 @@ import org.junit.Assert.assertNotNull import org.junit.Assert.assertNull import org.junit.Assert.assertTrue import org.junit.Test -import org.webrtc.CameraEnumerationAndroid import stream.video.sfu.models.Codec import stream.video.sfu.models.PublishOption import stream.video.sfu.models.TrackType diff --git a/stream-video-android-core/src/test/kotlin/io/getstream/video/android/core/rtc/RtcSessionTest2.kt b/stream-video-android-core/src/test/kotlin/io/getstream/video/android/core/rtc/RtcSessionTest2.kt index 8f1b28c8956..b227299c8a5 100644 --- a/stream-video-android-core/src/test/kotlin/io/getstream/video/android/core/rtc/RtcSessionTest2.kt +++ b/stream-video-android-core/src/test/kotlin/io/getstream/video/android/core/rtc/RtcSessionTest2.kt @@ -35,6 +35,7 @@ import io.getstream.video.android.core.internal.module.SfuConnectionModule import io.getstream.video.android.core.model.IceServer import io.getstream.video.android.core.socket.sfu.SfuSocketConnection import io.getstream.video.android.core.socket.sfu.state.SfuSocketState +import io.getstream.webrtc.SessionDescription import io.mockk.MockKAnnotations import io.mockk.coEvery import io.mockk.coJustRun @@ -60,7 +61,6 @@ import kotlinx.coroutines.test.runTest import org.junit.After import org.junit.Before import org.junit.Test -import org.webrtc.SessionDescription import stream.video.sfu.models.ParticipantCount import stream.video.sfu.models.PeerType import stream.video.sfu.models.PublishOption diff --git a/stream-video-android-previewdata/src/main/kotlin/io/getstream/video/android/mock/StreamPreviewDataUtils.kt b/stream-video-android-previewdata/src/main/kotlin/io/getstream/video/android/mock/StreamPreviewDataUtils.kt index 61f8956e29b..0911f2fbc3c 100644 --- a/stream-video-android-previewdata/src/main/kotlin/io/getstream/video/android/mock/StreamPreviewDataUtils.kt +++ b/stream-video-android-previewdata/src/main/kotlin/io/getstream/video/android/mock/StreamPreviewDataUtils.kt @@ -24,8 +24,8 @@ import io.getstream.video.android.core.StreamVideo import io.getstream.video.android.core.StreamVideoBuilder import io.getstream.video.android.core.model.MediaTrack import io.getstream.video.android.model.User +import io.getstream.webrtc.VideoTrack import org.threeten.bp.OffsetDateTime -import org.webrtc.VideoTrack import java.util.UUID /** diff --git a/stream-video-android-ui-compose/src/main/kotlin/io/getstream/video/android/compose/ui/components/call/lobby/CallLobby.kt b/stream-video-android-ui-compose/src/main/kotlin/io/getstream/video/android/compose/ui/components/call/lobby/CallLobby.kt index 276fae54285..8647cfc024a 100644 --- a/stream-video-android-ui-compose/src/main/kotlin/io/getstream/video/android/compose/ui/components/call/lobby/CallLobby.kt +++ b/stream-video-android-ui-compose/src/main/kotlin/io/getstream/video/android/compose/ui/components/call/lobby/CallLobby.kt @@ -98,7 +98,7 @@ public fun CallLobby( track = VideoTrack( streamId = call.sessionId, video = if (LocalInspectionMode.current) { - org.webrtc.VideoTrack(1000L) + io.getstream.webrtc.VideoTrack(1000L) } else { call.camera.mediaManager.videoTrack }, @@ -235,7 +235,7 @@ private fun CallLobbyPreview() { sessionId = previewCall.sessionId, track = VideoTrack( streamId = previewCall.sessionId, - video = org.webrtc.VideoTrack(1000L), + video = io.getstream.webrtc.VideoTrack(1000L), ), enabled = true, paused = false, diff --git a/stream-video-android-ui-compose/src/main/kotlin/io/getstream/video/android/compose/ui/components/video/VideoRenderer.kt b/stream-video-android-ui-compose/src/main/kotlin/io/getstream/video/android/compose/ui/components/video/VideoRenderer.kt index 270b229f00b..a5a795dfe75 100644 --- a/stream-video-android-ui-compose/src/main/kotlin/io/getstream/video/android/compose/ui/components/video/VideoRenderer.kt +++ b/stream-video-android-ui-compose/src/main/kotlin/io/getstream/video/android/compose/ui/components/video/VideoRenderer.kt @@ -330,7 +330,7 @@ private fun VideoRendererPreview() { VideoRenderer( call = previewCall, video = ParticipantState.Video( - track = VideoTrack("", org.webrtc.VideoTrack(123)), + track = VideoTrack("", io.getstream.webrtc.VideoTrack(123)), enabled = true, sessionId = "", paused = false, @@ -347,7 +347,7 @@ private fun VideoRendererPausedPreview() { VideoRenderer( call = previewCall, video = ParticipantState.Video( - track = VideoTrack("", org.webrtc.VideoTrack(123)), + track = VideoTrack("", io.getstream.webrtc.VideoTrack(123)), enabled = true, sessionId = "", paused = true, diff --git a/stream-video-android-ui-compose/src/main/kotlin/io/getstream/video/android/compose/ui/components/video/VideoScalingType.kt b/stream-video-android-ui-compose/src/main/kotlin/io/getstream/video/android/compose/ui/components/video/VideoScalingType.kt index 3d8134ddb84..154e010e9e9 100644 --- a/stream-video-android-ui-compose/src/main/kotlin/io/getstream/video/android/compose/ui/components/video/VideoScalingType.kt +++ b/stream-video-android-ui-compose/src/main/kotlin/io/getstream/video/android/compose/ui/components/video/VideoScalingType.kt @@ -16,7 +16,7 @@ package io.getstream.video.android.compose.ui.components.video -import org.webrtc.RendererCommon +import io.getstream.webrtc.RendererCommon /** * Types of video scaling: diff --git a/stream-video-android-ui-core/api/stream-video-android-ui-core.api b/stream-video-android-ui-core/api/stream-video-android-ui-core.api index fe9c34be7e3..9b8776aeaa9 100644 --- a/stream-video-android-ui-core/api/stream-video-android-ui-core.api +++ b/stream-video-android-ui-core/api/stream-video-android-ui-core.api @@ -260,7 +260,7 @@ public final class io/getstream/video/android/ui/common/view/ParticipantContentV public final class io/getstream/video/android/ui/common/view/ParticipantItemView : io/getstream/webrtc/android/ui/VideoTextureViewRenderer { public fun (Landroid/content/Context;)V public fun (Landroid/content/Context;Landroid/util/AttributeSet;)V - public final fun bindTrack (Lorg/webrtc/VideoTrack;)V + public final fun bindTrack (Lio/getstream/webrtc/VideoTrack;)V public final fun cleanUp ()V public final fun initialize (Lio/getstream/video/android/core/Call;Ljava/lang/String;Lkotlin/jvm/functions/Function1;)V public static synthetic fun initialize$default (Lio/getstream/video/android/ui/common/view/ParticipantItemView;Lio/getstream/video/android/core/Call;Ljava/lang/String;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V diff --git a/stream-video-android-ui-core/src/main/kotlin/io/getstream/video/android/ui/common/view/ParticipantItemView.kt b/stream-video-android-ui-core/src/main/kotlin/io/getstream/video/android/ui/common/view/ParticipantItemView.kt index e81237e9285..97f29bf5ac5 100644 --- a/stream-video-android-ui-core/src/main/kotlin/io/getstream/video/android/ui/common/view/ParticipantItemView.kt +++ b/stream-video-android-ui-core/src/main/kotlin/io/getstream/video/android/ui/common/view/ParticipantItemView.kt @@ -20,8 +20,8 @@ import android.content.Context import android.util.AttributeSet import android.view.View import io.getstream.video.android.core.Call +import io.getstream.webrtc.VideoTrack import io.getstream.webrtc.android.ui.VideoTextureViewRenderer -import org.webrtc.VideoTrack public class ParticipantItemView : VideoTextureViewRenderer { diff --git a/stream-video-android-ui-xml/api/stream-video-android-ui-xml.api b/stream-video-android-ui-xml/api/stream-video-android-ui-xml.api index b6b1791b252..b0523e9e594 100644 --- a/stream-video-android-ui-xml/api/stream-video-android-ui-xml.api +++ b/stream-video-android-ui-xml/api/stream-video-android-ui-xml.api @@ -62,10 +62,10 @@ public final class io/getstream/video/android/xml/databinding/StreamVideoActivit } public final class io/getstream/video/android/xml/databinding/StreamVideoItemParticipantBinding : androidx/viewbinding/ViewBinding { - public final field participantView Lorg/webrtc/SurfaceViewRenderer; + public final field participantView Lio/getstream/webrtc/SurfaceViewRenderer; public static fun bind (Landroid/view/View;)Lio/getstream/video/android/xml/databinding/StreamVideoItemParticipantBinding; public synthetic fun getRoot ()Landroid/view/View; - public fun getRoot ()Lorg/webrtc/SurfaceViewRenderer; + public fun getRoot ()Lio/getstream/webrtc/SurfaceViewRenderer; public static fun inflate (Landroid/view/LayoutInflater;)Lio/getstream/video/android/xml/databinding/StreamVideoItemParticipantBinding; public static fun inflate (Landroid/view/LayoutInflater;Landroid/view/ViewGroup;Z)Lio/getstream/video/android/xml/databinding/StreamVideoItemParticipantBinding; } diff --git a/stream-video-android-ui-xml/src/main/res/layout/stream_video_item_participant.xml b/stream-video-android-ui-xml/src/main/res/layout/stream_video_item_participant.xml index 2d736091c88..96bf1608477 100644 --- a/stream-video-android-ui-xml/src/main/res/layout/stream_video_item_participant.xml +++ b/stream-video-android-ui-xml/src/main/res/layout/stream_video_item_participant.xml @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. --> - \ No newline at end of file