Skip to content

Commit

Permalink
feat: Upgrade WebRTC package 2.4.0-exp.5 (#630)
Browse files Browse the repository at this point in the history
* fix flip streaming using ScreenStreamSender on Opengl

* fix compile error

* fix error

* update depend webrtc package version

* update manifest

* add package for ar sample

* add comment in screen stream sender

* add arfoundation

* update setting for testing with vulkan api

* exclude unit testing on andoid with Vulkan API for workaround

* fix test

* workaround: exclude standalone app testing with il2cpp on maoOS(Silicon)

Co-authored-by: kazuki <karasusan@gmail.com>
  • Loading branch information
kannan-xiao4 and karasusan committed Feb 7, 2022
1 parent 911c065 commit 31102c1
Show file tree
Hide file tree
Showing 26 changed files with 325 additions and 50 deletions.
14 changes: 8 additions & 6 deletions .yamato/meta/environments.yml
Expand Up @@ -63,9 +63,10 @@ platforms:
- backend: mono
additional_component_arg: StandaloneSupport-Mono
platform: standalone
- backend: il2cpp
additional_component_arg: StandaloneSupport-IL2CPP
platform: standalone
# todo(kazuki)
# - backend: il2cpp
# additional_component_arg: StandaloneSupport-IL2CPP
# platform: standalone
- name: linux
type: Unity::VM::GPU
image: renderstreaming/ubuntu-18.04:latest
Expand Down Expand Up @@ -93,9 +94,10 @@ template_projects:
- name: renderstreaming-rtx
packagename: com.unity.template.renderstreaming-rtx
test_targets_android:
- name: vulkan
playergraphicsapi: Vulkan
extra-editor-arg: vulkan
# todo(kazuki):
# - name: vulkan
# playergraphicsapi: Vulkan
# extra-editor-arg: vulkan
- name: opengles3
playergraphicsapi: OpenGLES3
extra-editor-arg: gles3
8 changes: 8 additions & 0 deletions RenderStreaming~/Assets/XR.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions RenderStreaming~/Assets/XR/Loaders.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 14 additions & 0 deletions RenderStreaming~/Assets/XR/Loaders/AR Core Loader.asset
@@ -0,0 +1,14 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 06042c85f885b4d1886f3ca5a1074eca, type: 3}
m_Name: AR Core Loader
m_EditorClassIdentifier:
8 changes: 8 additions & 0 deletions RenderStreaming~/Assets/XR/Loaders/AR Core Loader.asset.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 14 additions & 0 deletions RenderStreaming~/Assets/XR/Loaders/AR Kit Loader.asset
@@ -0,0 +1,14 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: a18c4d6661b404073b154020b9e2d993, type: 3}
m_Name: AR Kit Loader
m_EditorClassIdentifier:
8 changes: 8 additions & 0 deletions RenderStreaming~/Assets/XR/Loaders/AR Kit Loader.asset.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions RenderStreaming~/Assets/XR/Settings.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

17 changes: 17 additions & 0 deletions RenderStreaming~/Assets/XR/Settings/AR Core Settings.asset
@@ -0,0 +1,17 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 9dae4501572e1418791be3e3bf1f7faa, type: 3}
m_Name: AR Core Settings
m_EditorClassIdentifier:
m_Requirement: 0
m_Depth: 0
m_IgnoreGradleVersion: 0

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 16 additions & 0 deletions RenderStreaming~/Assets/XR/Settings/AR Kit Settings.asset
@@ -0,0 +1,16 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 7a3c2811d41034e52a6d6c33ac73a207, type: 3}
m_Name: AR Kit Settings
m_EditorClassIdentifier:
m_Requirement: 0
m_FaceTracking: 0

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

79 changes: 79 additions & 0 deletions RenderStreaming~/Assets/XR/XRGeneralSettings.asset
@@ -0,0 +1,79 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &-1311834860605739672
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: f4c3631f5e58749a59194e0cf6baf6d5, type: 3}
m_Name: Standalone Providers
m_EditorClassIdentifier:
m_RequiresSettingsUpdate: 0
m_AutomaticLoading: 0
m_AutomaticRunning: 0
m_Loaders: []
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: d2dc886499c26824283350fa532d087d, type: 3}
m_Name: XRGeneralSettings
m_EditorClassIdentifier:
Keys: 0100000007000000
Values:
- {fileID: 8729709779697779721}
- {fileID: 8726876917429342715}
--- !u!114 &3420978711675446793
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: f4c3631f5e58749a59194e0cf6baf6d5, type: 3}
m_Name: Android Providers
m_EditorClassIdentifier:
m_RequiresSettingsUpdate: 0
m_AutomaticLoading: 0
m_AutomaticRunning: 0
m_Loaders:
- {fileID: 11400000, guid: 7f313a69ff182b84fbe4bb140d3ad922, type: 2}
--- !u!114 &8726876917429342715
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: d236b7d11115f2143951f1e14045df39, type: 3}
m_Name: Android Settings
m_EditorClassIdentifier:
m_LoaderManagerInstance: {fileID: 3420978711675446793}
m_InitManagerOnStart: 1
--- !u!114 &8729709779697779721
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: d236b7d11115f2143951f1e14045df39, type: 3}
m_Name: Standalone Settings
m_EditorClassIdentifier:
m_LoaderManagerInstance: {fileID: -1311834860605739672}
m_InitManagerOnStart: 1
8 changes: 8 additions & 0 deletions RenderStreaming~/Assets/XR/XRGeneralSettings.asset.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 5 additions & 4 deletions RenderStreaming~/Packages/manifest.json
Expand Up @@ -2,13 +2,14 @@
"dependencies": {
"com.unity.2d.sprite": "1.0.0",
"com.unity.2d.tilemap": "1.0.0",
"com.unity.ide.rider": "3.0.7",
"com.unity.ide.visualstudio": "2.0.12",
"com.unity.ide.rider": "3.0.12",
"com.unity.ide.visualstudio": "2.0.14",
"com.unity.ide.vscode": "1.2.4",
"com.unity.test-framework": "1.1.30",
"com.unity.ugui": "1.0.0",
"com.unity.xr.arcore": "4.1.7",
"com.unity.xr.management": "4.2.0",
"com.unity.xr.arcore": "4.1.9",
"com.unity.xr.arfoundation": "4.1.9",
"com.unity.xr.arkit": "4.1.9",
"com.unity.modules.ai": "1.0.0",
"com.unity.modules.androidjni": "1.0.0",
"com.unity.modules.animation": "1.0.0",
Expand Down
47 changes: 35 additions & 12 deletions RenderStreaming~/Packages/packages-lock.json
Expand Up @@ -14,7 +14,7 @@
},
"com.unity.editorcoroutines": {
"version": "1.0.0",
"depth": 2,
"depth": 1,
"source": "registry",
"dependencies": {},
"url": "https://packages.unity.com"
Expand All @@ -27,7 +27,7 @@
"url": "https://packages.unity.com"
},
"com.unity.ide.rider": {
"version": "3.0.7",
"version": "3.0.12",
"depth": 0,
"source": "registry",
"dependencies": {
Expand All @@ -36,7 +36,7 @@
"url": "https://packages.unity.com"
},
"com.unity.ide.visualstudio": {
"version": "2.0.12",
"version": "2.0.14",
"depth": 0,
"source": "registry",
"dependencies": {
Expand All @@ -63,7 +63,7 @@
"depth": 0,
"source": "embedded",
"dependencies": {
"com.unity.webrtc": "2.4.0-exp.4",
"com.unity.webrtc": "2.4.0-exp.5",
"com.unity.inputsystem": "1.0.2"
}
},
Expand Down Expand Up @@ -97,7 +97,7 @@
}
},
"com.unity.webrtc": {
"version": "2.4.0-exp.4",
"version": "2.4.0-exp.5",
"depth": 1,
"source": "registry",
"dependencies": {
Expand All @@ -107,18 +107,41 @@
"url": "https://packages.unity.com"
},
"com.unity.xr.arcore": {
"version": "4.1.7",
"version": "4.1.9",
"depth": 0,
"source": "registry",
"dependencies": {
"com.unity.xr.arsubsystems": "4.1.9",
"com.unity.xr.management": "4.0.1",
"com.unity.modules.androidjni": "1.0.0",
"com.unity.modules.unitywebrequest": "1.0.0"
},
"url": "https://packages.unity.com"
},
"com.unity.xr.arfoundation": {
"version": "4.1.9",
"depth": 0,
"source": "registry",
"dependencies": {
"com.unity.xr.arsubsystems": "4.1.7",
"com.unity.xr.arsubsystems": "4.1.9",
"com.unity.xr.management": "4.0.1",
"com.unity.modules.androidjni": "1.0.0"
"com.unity.modules.particlesystem": "1.0.0"
},
"url": "https://packages.unity.com"
},
"com.unity.xr.arkit": {
"version": "4.1.9",
"depth": 0,
"source": "registry",
"dependencies": {
"com.unity.editorcoroutines": "1.0.0",
"com.unity.xr.arsubsystems": "4.1.9",
"com.unity.xr.management": "4.0.1"
},
"url": "https://packages.unity.com"
},
"com.unity.xr.arsubsystems": {
"version": "4.1.7",
"version": "4.1.9",
"depth": 1,
"source": "registry",
"dependencies": {
Expand All @@ -128,7 +151,7 @@
},
"com.unity.xr.legacyinputhelpers": {
"version": "2.1.8",
"depth": 1,
"depth": 2,
"source": "registry",
"dependencies": {
"com.unity.modules.vr": "1.0.0",
Expand All @@ -137,8 +160,8 @@
"url": "https://packages.unity.com"
},
"com.unity.xr.management": {
"version": "4.2.0",
"depth": 0,
"version": "4.0.1",
"depth": 1,
"source": "registry",
"dependencies": {
"com.unity.modules.subsystems": "1.0.0",
Expand Down
8 changes: 7 additions & 1 deletion RenderStreaming~/ProjectSettings/EditorBuildSettings.asset
Expand Up @@ -38,4 +38,10 @@ EditorBuildSettings:
- enabled: 1
path: Assets/Samples/Example/Multiplay/Multiplay.unity
guid: e807d14debe77b243882e9e5949c104d
m_configObjects: {}
m_configObjects:
UnityEditor.XR.ARCore.ARCoreSettings: {fileID: 11400000, guid: 3484399237ac7f4489fe37bf114d4c3d,
type: 2}
UnityEditor.XR.ARKit.ARKitSettings: {fileID: 11400000, guid: 8c1796da6b9ff3a409077a9bd90a4acf,
type: 2}
com.unity.xr.management.loader_settings: {fileID: 11400000, guid: 66105b57eda77e74db55e7eb2b532054,
type: 2}

0 comments on commit 31102c1

Please sign in to comment.