chore: Upgrade WebRTC package 2.4.0-exp.11 (#788)

* upgrade webrtc package * fix
Unity-Technologies · Oct 5, 2022 · df423b6 · df423b6
1 parent 0d49665
commit df423b6
Show file tree

Hide file tree

Showing 8 changed files with 33 additions and 26 deletions.
diff --git a/RenderStreaming~/Packages/packages-lock.json b/RenderStreaming~/Packages/packages-lock.json
@@ -40,7 +40,7 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.inputsystem": {
-      "version": "1.4.1",
+      "version": "1.4.2",
       "depth": 1,
       "source": "registry",
       "dependencies": {
@@ -53,7 +53,7 @@
       "depth": 0,
       "source": "embedded",
       "dependencies": {
-        "com.unity.webrtc": "2.4.0-exp.10",
+        "com.unity.webrtc": "2.4.0-exp.11",
         "com.unity.inputsystem": "1.4.1"
       }
     },
@@ -104,7 +104,7 @@
       }
     },
     "com.unity.webrtc": {
-      "version": "2.4.0-exp.10",
+      "version": "2.4.0-exp.11",
       "depth": 1,
       "source": "registry",
       "dependencies": {

diff --git a/RenderStreaming~/ProjectSettings/ProjectVersion.txt b/RenderStreaming~/ProjectSettings/ProjectVersion.txt
@@ -1,2 +1,2 @@
-m_EditorVersion: 2021.3.9f1
-m_EditorVersionWithRevision: 2021.3.9f1 (ad3870b89536)
+m_EditorVersion: 2021.3.11f1
+m_EditorVersionWithRevision: 2021.3.11f1 (0a5ca18544bf)
diff --git a/TestProjects/Empty/Packages/manifest.json b/TestProjects/Empty/Packages/manifest.json
@@ -1,9 +1,9 @@
 {
   "dependencies": {
     "com.unity.renderstreaming": "file:../../../com.unity.renderstreaming",
-    "com.unity.test-framework": "1.1.30",
-    "com.unity.textmeshpro": "2.1.1",
-    "com.unity.timeline": "1.2.17",
+    "com.unity.test-framework": "1.1.31",
+    "com.unity.textmeshpro": "3.0.6",
+    "com.unity.timeline": "1.6.4",
     "com.unity.ugui": "1.0.0",
     "com.unity.modules.ai": "1.0.0",
     "com.unity.modules.androidjni": "1.0.0",

diff --git a/TestProjects/Empty/Packages/packages-lock.json b/TestProjects/Empty/Packages/packages-lock.json
@@ -15,23 +15,25 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.inputsystem": {
-      "version": "1.0.2",
+      "version": "1.4.2",
       "depth": 1,
       "source": "registry",
-      "dependencies": {},
+      "dependencies": {
+        "com.unity.modules.uielements": "1.0.0"
+      },
       "url": "https://packages.unity.com"
     },
     "com.unity.renderstreaming": {
       "version": "file:../../../com.unity.renderstreaming",
       "depth": 0,
       "source": "local",
       "dependencies": {
-        "com.unity.webrtc": "2.4.0-exp.4",
-        "com.unity.inputsystem": "1.0.2"
+        "com.unity.webrtc": "2.4.0-exp.11",
+        "com.unity.inputsystem": "1.4.1"
       }
     },
     "com.unity.test-framework": {
-      "version": "1.1.30",
+      "version": "1.1.31",
       "depth": 0,
       "source": "registry",
       "dependencies": {
@@ -42,7 +44,7 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.textmeshpro": {
-      "version": "2.1.1",
+      "version": "3.0.6",
       "depth": 0,
       "source": "registry",
       "dependencies": {
@@ -51,10 +53,15 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.timeline": {
-      "version": "1.2.17",
+      "version": "1.6.4",
       "depth": 0,
       "source": "registry",
-      "dependencies": {},
+      "dependencies": {
+        "com.unity.modules.director": "1.0.0",
+        "com.unity.modules.animation": "1.0.0",
+        "com.unity.modules.audio": "1.0.0",
+        "com.unity.modules.particlesystem": "1.0.0"
+      },
       "url": "https://packages.unity.com"
     },
     "com.unity.ugui": {
@@ -67,7 +74,7 @@
       }
     },
     "com.unity.webrtc": {
-      "version": "2.4.0-exp.4",
+      "version": "2.4.0-exp.11",
       "depth": 1,
       "source": "registry",
       "dependencies": {

diff --git a/TestProjects/Empty/ProjectSettings/ProjectVersion.txt b/TestProjects/Empty/ProjectSettings/ProjectVersion.txt
@@ -1,2 +1,2 @@
-m_EditorVersion: 2020.3.27f1
-m_EditorVersionWithRevision: 2020.3.27f1 (e759542391ea)
+m_EditorVersion: 2021.3.11f1
+m_EditorVersionWithRevision: 2021.3.11f1 (0a5ca18544bf)
diff --git a/com.unity.renderstreaming/Tests/Runtime/RenderStreamingInternalTest.cs b/com.unity.renderstreaming/Tests/Runtime/RenderStreamingInternalTest.cs
@@ -192,7 +192,7 @@ public IEnumerator AddTrack(TestMode mode)
 
             var camObj = new GameObject("Camera");
             var camera = camObj.AddComponent<Camera>();
-            VideoStreamTrack track = camera.CaptureStreamTrack(1280, 720, 0);
+            VideoStreamTrack track = camera.CaptureStreamTrack(1280, 720);
 
             var transceiver = target.AddSenderTrack(connectionId, track);
             Assert.That(transceiver.Direction, Is.EqualTo(RTCRtpTransceiverDirection.SendOnly));
@@ -271,13 +271,13 @@ public IEnumerator AddTrackMultiple(TestMode mode)
 
             var camObj = new GameObject("Camera");
             var camera = camObj.AddComponent<Camera>();
-            VideoStreamTrack track = camera.CaptureStreamTrack(1280, 720, 0);
+            VideoStreamTrack track = camera.CaptureStreamTrack(1280, 720);
             var transceiver1 = target.AddSenderTrack(connectionId, track);
             Assert.That(transceiver1.Direction, Is.EqualTo(RTCRtpTransceiverDirection.SendOnly));
 
             var camObj2 = new GameObject("Camera2");
             var camera2 = camObj2.AddComponent<Camera>();
-            VideoStreamTrack track2 = camera2.CaptureStreamTrack(1280, 720, 0);
+            VideoStreamTrack track2 = camera2.CaptureStreamTrack(1280, 720);
             var transceiver2 = target.AddSenderTrack(connectionId, track2);
             Assert.That(transceiver2.Direction, Is.EqualTo(RTCRtpTransceiverDirection.SendOnly));
 
@@ -373,7 +373,7 @@ public IEnumerator OnAddReceiverPrivateMode()
 
             var camObj = new GameObject("Camera");
             var camera = camObj.AddComponent<Camera>();
-            VideoStreamTrack track = camera.CaptureStreamTrack(1280, 720, 0);
+            VideoStreamTrack track = camera.CaptureStreamTrack(1280, 720);
 
             // send offer automatically after adding a Track
             var transceiver = target2.AddSenderTrack(connectionId, track);
@@ -450,7 +450,7 @@ public IEnumerator OnAddReceiverPublicMode()
 
             var camObj = new GameObject("Camera");
             var camera = camObj.AddComponent<Camera>();
-            VideoStreamTrack track = camera.CaptureStreamTrack(1280, 720, 0);
+            VideoStreamTrack track = camera.CaptureStreamTrack(1280, 720);
             var transceiver2 = target2.AddSenderTrack(connectionId, track);
             Assert.That(transceiver2.Direction, Is.EqualTo(RTCRtpTransceiverDirection.SendOnly));
             target2.SendAnswer(connectionId);

diff --git a/com.unity.renderstreaming/Tests/Runtime/SignalingHandlerTest.cs b/com.unity.renderstreaming/Tests/Runtime/SignalingHandlerTest.cs
@@ -34,7 +34,7 @@ internal override WaitForCreateTrack CreateTrack()
         {
             m_camera = gameObject.AddComponent<Camera>();
             var instruction = new WaitForCreateTrack();
-            instruction.Done(m_camera.CaptureStreamTrack(256, 256, 0));
+            instruction.Done(m_camera.CaptureStreamTrack(256, 256));
             return instruction;
         }
     }

diff --git a/com.unity.renderstreaming/package.json b/com.unity.renderstreaming/package.json
@@ -5,7 +5,7 @@
   "unity": "2020.3",
   "description": "This is a package for using Unity Render Streaming technology. It contains two samples to use the technology.",
   "dependencies": {
-    "com.unity.webrtc": "2.4.0-exp.10",
+    "com.unity.webrtc": "2.4.0-exp.11",
     "com.unity.inputsystem": "1.4.1"
   },
   "samples": [