Skip to content

Commit df423b6

Browse files
authored
chore: Upgrade WebRTC package 2.4.0-exp.11 (#788)
* upgrade webrtc package * fix
1 parent 0d49665 commit df423b6

File tree

8 files changed

+33
-26
lines changed

8 files changed

+33
-26
lines changed

RenderStreaming~/Packages/packages-lock.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
"url": "https://packages.unity.com"
4141
},
4242
"com.unity.inputsystem": {
43-
"version": "1.4.1",
43+
"version": "1.4.2",
4444
"depth": 1,
4545
"source": "registry",
4646
"dependencies": {
@@ -53,7 +53,7 @@
5353
"depth": 0,
5454
"source": "embedded",
5555
"dependencies": {
56-
"com.unity.webrtc": "2.4.0-exp.10",
56+
"com.unity.webrtc": "2.4.0-exp.11",
5757
"com.unity.inputsystem": "1.4.1"
5858
}
5959
},
@@ -104,7 +104,7 @@
104104
}
105105
},
106106
"com.unity.webrtc": {
107-
"version": "2.4.0-exp.10",
107+
"version": "2.4.0-exp.11",
108108
"depth": 1,
109109
"source": "registry",
110110
"dependencies": {
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
m_EditorVersion: 2021.3.9f1
2-
m_EditorVersionWithRevision: 2021.3.9f1 (ad3870b89536)
1+
m_EditorVersion: 2021.3.11f1
2+
m_EditorVersionWithRevision: 2021.3.11f1 (0a5ca18544bf)

TestProjects/Empty/Packages/manifest.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
{
22
"dependencies": {
33
"com.unity.renderstreaming": "file:../../../com.unity.renderstreaming",
4-
"com.unity.test-framework": "1.1.30",
5-
"com.unity.textmeshpro": "2.1.1",
6-
"com.unity.timeline": "1.2.17",
4+
"com.unity.test-framework": "1.1.31",
5+
"com.unity.textmeshpro": "3.0.6",
6+
"com.unity.timeline": "1.6.4",
77
"com.unity.ugui": "1.0.0",
88
"com.unity.modules.ai": "1.0.0",
99
"com.unity.modules.androidjni": "1.0.0",

TestProjects/Empty/Packages/packages-lock.json

Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,23 +15,25 @@
1515
"url": "https://packages.unity.com"
1616
},
1717
"com.unity.inputsystem": {
18-
"version": "1.0.2",
18+
"version": "1.4.2",
1919
"depth": 1,
2020
"source": "registry",
21-
"dependencies": {},
21+
"dependencies": {
22+
"com.unity.modules.uielements": "1.0.0"
23+
},
2224
"url": "https://packages.unity.com"
2325
},
2426
"com.unity.renderstreaming": {
2527
"version": "file:../../../com.unity.renderstreaming",
2628
"depth": 0,
2729
"source": "local",
2830
"dependencies": {
29-
"com.unity.webrtc": "2.4.0-exp.4",
30-
"com.unity.inputsystem": "1.0.2"
31+
"com.unity.webrtc": "2.4.0-exp.11",
32+
"com.unity.inputsystem": "1.4.1"
3133
}
3234
},
3335
"com.unity.test-framework": {
34-
"version": "1.1.30",
36+
"version": "1.1.31",
3537
"depth": 0,
3638
"source": "registry",
3739
"dependencies": {
@@ -42,7 +44,7 @@
4244
"url": "https://packages.unity.com"
4345
},
4446
"com.unity.textmeshpro": {
45-
"version": "2.1.1",
47+
"version": "3.0.6",
4648
"depth": 0,
4749
"source": "registry",
4850
"dependencies": {
@@ -51,10 +53,15 @@
5153
"url": "https://packages.unity.com"
5254
},
5355
"com.unity.timeline": {
54-
"version": "1.2.17",
56+
"version": "1.6.4",
5557
"depth": 0,
5658
"source": "registry",
57-
"dependencies": {},
59+
"dependencies": {
60+
"com.unity.modules.director": "1.0.0",
61+
"com.unity.modules.animation": "1.0.0",
62+
"com.unity.modules.audio": "1.0.0",
63+
"com.unity.modules.particlesystem": "1.0.0"
64+
},
5865
"url": "https://packages.unity.com"
5966
},
6067
"com.unity.ugui": {
@@ -67,7 +74,7 @@
6774
}
6875
},
6976
"com.unity.webrtc": {
70-
"version": "2.4.0-exp.4",
77+
"version": "2.4.0-exp.11",
7178
"depth": 1,
7279
"source": "registry",
7380
"dependencies": {
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
m_EditorVersion: 2020.3.27f1
2-
m_EditorVersionWithRevision: 2020.3.27f1 (e759542391ea)
1+
m_EditorVersion: 2021.3.11f1
2+
m_EditorVersionWithRevision: 2021.3.11f1 (0a5ca18544bf)

com.unity.renderstreaming/Tests/Runtime/RenderStreamingInternalTest.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ public IEnumerator AddTrack(TestMode mode)
192192

193193
var camObj = new GameObject("Camera");
194194
var camera = camObj.AddComponent<Camera>();
195-
VideoStreamTrack track = camera.CaptureStreamTrack(1280, 720, 0);
195+
VideoStreamTrack track = camera.CaptureStreamTrack(1280, 720);
196196

197197
var transceiver = target.AddSenderTrack(connectionId, track);
198198
Assert.That(transceiver.Direction, Is.EqualTo(RTCRtpTransceiverDirection.SendOnly));
@@ -271,13 +271,13 @@ public IEnumerator AddTrackMultiple(TestMode mode)
271271

272272
var camObj = new GameObject("Camera");
273273
var camera = camObj.AddComponent<Camera>();
274-
VideoStreamTrack track = camera.CaptureStreamTrack(1280, 720, 0);
274+
VideoStreamTrack track = camera.CaptureStreamTrack(1280, 720);
275275
var transceiver1 = target.AddSenderTrack(connectionId, track);
276276
Assert.That(transceiver1.Direction, Is.EqualTo(RTCRtpTransceiverDirection.SendOnly));
277277

278278
var camObj2 = new GameObject("Camera2");
279279
var camera2 = camObj2.AddComponent<Camera>();
280-
VideoStreamTrack track2 = camera2.CaptureStreamTrack(1280, 720, 0);
280+
VideoStreamTrack track2 = camera2.CaptureStreamTrack(1280, 720);
281281
var transceiver2 = target.AddSenderTrack(connectionId, track2);
282282
Assert.That(transceiver2.Direction, Is.EqualTo(RTCRtpTransceiverDirection.SendOnly));
283283

@@ -373,7 +373,7 @@ public IEnumerator OnAddReceiverPrivateMode()
373373

374374
var camObj = new GameObject("Camera");
375375
var camera = camObj.AddComponent<Camera>();
376-
VideoStreamTrack track = camera.CaptureStreamTrack(1280, 720, 0);
376+
VideoStreamTrack track = camera.CaptureStreamTrack(1280, 720);
377377

378378
// send offer automatically after adding a Track
379379
var transceiver = target2.AddSenderTrack(connectionId, track);
@@ -450,7 +450,7 @@ public IEnumerator OnAddReceiverPublicMode()
450450

451451
var camObj = new GameObject("Camera");
452452
var camera = camObj.AddComponent<Camera>();
453-
VideoStreamTrack track = camera.CaptureStreamTrack(1280, 720, 0);
453+
VideoStreamTrack track = camera.CaptureStreamTrack(1280, 720);
454454
var transceiver2 = target2.AddSenderTrack(connectionId, track);
455455
Assert.That(transceiver2.Direction, Is.EqualTo(RTCRtpTransceiverDirection.SendOnly));
456456
target2.SendAnswer(connectionId);

com.unity.renderstreaming/Tests/Runtime/SignalingHandlerTest.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ internal override WaitForCreateTrack CreateTrack()
3434
{
3535
m_camera = gameObject.AddComponent<Camera>();
3636
var instruction = new WaitForCreateTrack();
37-
instruction.Done(m_camera.CaptureStreamTrack(256, 256, 0));
37+
instruction.Done(m_camera.CaptureStreamTrack(256, 256));
3838
return instruction;
3939
}
4040
}

com.unity.renderstreaming/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"unity": "2020.3",
66
"description": "This is a package for using Unity Render Streaming technology. It contains two samples to use the technology.",
77
"dependencies": {
8-
"com.unity.webrtc": "2.4.0-exp.10",
8+
"com.unity.webrtc": "2.4.0-exp.11",
99
"com.unity.inputsystem": "1.4.1"
1010
},
1111
"samples": [

0 commit comments

Comments
 (0)