diff --git a/.yamato/compile-package.yml b/.yamato/compile-package.yml index c33dd3c1e..cbd991b21 100644 --- a/.yamato/compile-package.yml +++ b/.yamato/compile-package.yml @@ -5,7 +5,7 @@ compile_test_for_package_version: flavor: b1.large image: package-ci/win10:v4 variables: - VERSION: 3.1.0-exp.4 + VERSION: 3.1.0-exp.5 commands: # When unity-config will be part of the image, this will turn into a no-op - | diff --git a/README.md b/README.md index 34090ea58..2f8f13a2e 100644 --- a/README.md +++ b/README.md @@ -55,7 +55,7 @@ Please see [Furioos Tutorial](com.unity.renderstreaming/Documentation~/deploy-to | `3.1.0-exp.2` | - Audio Renderer support
- Multiplay sample
- M1 Mac support | Dec 2021 | | `3.1.0-exp.3` | - Fix bugs | Feb 2022 | | `3.1.0-exp.4` | - Streaming settings API
- *Unity 2022.1* support
- Remove *Unity 2019.4* from support list | Oct 2022 | -| `3.1.0-exp.5` | - Fix bugs | Dec 2023 | +| `3.1.0-exp.5` | - Fix bugs | Jan 2023 | | `3.1.0-exp.6` | - Streaming Settings Window
- Auto Configuration | Feb 2023 | ## FAQ diff --git a/RenderStreaming~/Packages/packages-lock.json b/RenderStreaming~/Packages/packages-lock.json index 8ff3a71cb..fb87c376f 100644 --- a/RenderStreaming~/Packages/packages-lock.json +++ b/RenderStreaming~/Packages/packages-lock.json @@ -53,7 +53,7 @@ "depth": 0, "source": "embedded", "dependencies": { - "com.unity.webrtc": "3.0.0-pre.3", + "com.unity.webrtc": "3.0.0-pre.4", "com.unity.inputsystem": "1.4.4", "com.unity.ugui": "1.0.0", "com.unity.modules.screencapture": "1.0.0" @@ -106,7 +106,7 @@ } }, "com.unity.webrtc": { - "version": "3.0.0-pre.3", + "version": "3.0.0-pre.4", "depth": 1, "source": "registry", "dependencies": { diff --git a/RenderStreaming~/ProjectSettings/ProjectVersion.txt b/RenderStreaming~/ProjectSettings/ProjectVersion.txt index eabd63377..3643b0227 100644 --- a/RenderStreaming~/ProjectSettings/ProjectVersion.txt +++ b/RenderStreaming~/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 2021.3.15f1 -m_EditorVersionWithRevision: 2021.3.15f1 (e8e88683f834) +m_EditorVersion: 2021.3.16f1 +m_EditorVersionWithRevision: 2021.3.16f1 (4016570cf34f) diff --git a/TestProjects/Empty/Packages/packages-lock.json b/TestProjects/Empty/Packages/packages-lock.json index 2e60e3071..17e5d269e 100644 --- a/TestProjects/Empty/Packages/packages-lock.json +++ b/TestProjects/Empty/Packages/packages-lock.json @@ -15,7 +15,7 @@ "url": "https://packages.unity.com" }, "com.unity.inputsystem": { - "version": "1.4.2", + "version": "1.4.4", "depth": 1, "source": "registry", "dependencies": { @@ -28,8 +28,10 @@ "depth": 0, "source": "local", "dependencies": { - "com.unity.webrtc": "2.4.0-exp.11", - "com.unity.inputsystem": "1.4.1" + "com.unity.webrtc": "3.0.0-pre.4", + "com.unity.inputsystem": "1.4.4", + "com.unity.ugui": "1.0.0", + "com.unity.modules.screencapture": "1.0.0" } }, "com.unity.test-framework": { @@ -74,12 +76,13 @@ } }, "com.unity.webrtc": { - "version": "2.4.0-exp.11", + "version": "3.0.0-pre.4", "depth": 1, "source": "registry", "dependencies": { "com.unity.modules.jsonserialize": "1.0.0", - "com.unity.editorcoroutines": "1.0.0" + "com.unity.editorcoroutines": "1.0.0", + "com.unity.modules.audio": "1.0.0" }, "url": "https://packages.unity.com" }, diff --git a/TestProjects/Empty/ProjectSettings/ProjectVersion.txt b/TestProjects/Empty/ProjectSettings/ProjectVersion.txt index 8ea1b855a..3643b0227 100644 --- a/TestProjects/Empty/ProjectSettings/ProjectVersion.txt +++ b/TestProjects/Empty/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 2021.3.11f1 -m_EditorVersionWithRevision: 2021.3.11f1 (0a5ca18544bf) +m_EditorVersion: 2021.3.16f1 +m_EditorVersionWithRevision: 2021.3.16f1 (4016570cf34f) diff --git a/com.unity.renderstreaming/CHANGELOG.md b/com.unity.renderstreaming/CHANGELOG.md index c61f9af60..cd637c3a4 100644 --- a/com.unity.renderstreaming/CHANGELOG.md +++ b/com.unity.renderstreaming/CHANGELOG.md @@ -4,12 +4,12 @@ All notable changes to com.unity.renderstreaming package will be documented in t The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html). -## [3.1.0-exp.5] - 2022-12-22 +## [3.1.0-exp.5] - 2023-1-16 ### Changed - Upgrade the version of Input System package `1.4.4`. -- Upgrade the version of WebRTC package `3.0.0-pre.2`. +- Upgrade the version of WebRTC package `3.0.0-pre.4`. ### Fixed diff --git a/com.unity.renderstreaming/Documentation~/create-scene.md b/com.unity.renderstreaming/Documentation~/create-scene.md index e5258c5aa..92dafa398 100644 --- a/com.unity.renderstreaming/Documentation~/create-scene.md +++ b/com.unity.renderstreaming/Documentation~/create-scene.md @@ -31,7 +31,7 @@ Add a [**Video Stream Sender**](video-streaming.html#videostreamsenderapiunityre ![Add VideoStreamSender component](images/add_videostreamsender_component.png) -Assign the [**Video Stream Sender**](video-streaming.html#videostreamsenderapiunityrenderstreamingvideostreamsenderhtml-component) component to the **Broadcast** component property. +Assign the [**Video Stream Sender**](video-streaming.html#videostreamsenderapiunityrenderstreamingvideostreamsenderhtml-component) component to the **Broadcast** component property. And set camera ![Assign VideoStreamSender component to streams](images/assign_videostreamsender_to_streams.png) diff --git a/com.unity.renderstreaming/Documentation~/images/assign_videostreamsender_to_streams.png b/com.unity.renderstreaming/Documentation~/images/assign_videostreamsender_to_streams.png index e4a758084..ec80f33f7 100644 Binary files a/com.unity.renderstreaming/Documentation~/images/assign_videostreamsender_to_streams.png and b/com.unity.renderstreaming/Documentation~/images/assign_videostreamsender_to_streams.png differ diff --git a/com.unity.renderstreaming/Documentation~/images/control_camera_06.png b/com.unity.renderstreaming/Documentation~/images/control_camera_06.png index b8f10b381..3e366f42c 100644 Binary files a/com.unity.renderstreaming/Documentation~/images/control_camera_06.png and b/com.unity.renderstreaming/Documentation~/images/control_camera_06.png differ diff --git a/com.unity.renderstreaming/Documentation~/images/inputreceiver_inspector.png b/com.unity.renderstreaming/Documentation~/images/inputreceiver_inspector.png index ed64f7929..7d8ab06e0 100644 Binary files a/com.unity.renderstreaming/Documentation~/images/inputreceiver_inspector.png and b/com.unity.renderstreaming/Documentation~/images/inputreceiver_inspector.png differ diff --git a/com.unity.renderstreaming/Runtime/Scripts/RenderStreaming.cs b/com.unity.renderstreaming/Runtime/Scripts/RenderStreaming.cs index 2366c2bba..27ba72bbf 100644 --- a/com.unity.renderstreaming/Runtime/Scripts/RenderStreaming.cs +++ b/com.unity.renderstreaming/Runtime/Scripts/RenderStreaming.cs @@ -12,6 +12,7 @@ namespace Unity.RenderStreaming { + [AddComponentMenu("Render Streaming/Render Streaming")] public sealed class RenderStreaming : MonoBehaviour { #pragma warning disable 0649 diff --git a/com.unity.renderstreaming/Tests/Runtime/RenderStreamingInternalTest.cs b/com.unity.renderstreaming/Tests/Runtime/RenderStreamingInternalTest.cs index 3ae2377fe..36c1a1fcb 100644 --- a/com.unity.renderstreaming/Tests/Runtime/RenderStreamingInternalTest.cs +++ b/com.unity.renderstreaming/Tests/Runtime/RenderStreamingInternalTest.cs @@ -330,7 +330,7 @@ public IEnumerator CreateChannel(TestMode mode) //todo:: crash in dispose process on standalone linux [UnityTest, Timeout(10000)] - [UnityPlatform(exclude = new[] { RuntimePlatform.LinuxPlayer })] + [UnityPlatform(exclude = new[] { RuntimePlatform.LinuxPlayer, RuntimePlatform.Android })] public IEnumerator OnAddReceiverPrivateMode() { MockSignaling.Reset(true); @@ -403,7 +403,7 @@ public IEnumerator OnAddReceiverPrivateMode() //todo:: crash in dispose process on standalone linux [UnityTest, Timeout(10000)] - [UnityPlatform(exclude = new[] { RuntimePlatform.LinuxPlayer })] + [UnityPlatform(exclude = new[] { RuntimePlatform.LinuxPlayer, RuntimePlatform.Android })] public IEnumerator OnAddReceiverPublicMode() { MockSignaling.Reset(false); diff --git a/com.unity.renderstreaming/Tests/Runtime/SignalingHandlerTest.cs b/com.unity.renderstreaming/Tests/Runtime/SignalingHandlerTest.cs index fd103b7ad..73ee98188 100644 --- a/com.unity.renderstreaming/Tests/Runtime/SignalingHandlerTest.cs +++ b/com.unity.renderstreaming/Tests/Runtime/SignalingHandlerTest.cs @@ -172,7 +172,7 @@ public void AddDataChannel() //todo:: crash in dispose process on standalone linux [UnityTest, Timeout(10000)] - [UnityPlatform(exclude = new[] { RuntimePlatform.LinuxPlayer })] + [UnityPlatform(exclude = new[] { RuntimePlatform.LinuxPlayer, RuntimePlatform.Android })] public IEnumerator ReceiveStream() { string connectionId = "12345"; @@ -228,7 +228,7 @@ public IEnumerator ReceiveStream() [UnityPlatform(exclude = new[] { RuntimePlatform.WindowsEditor, RuntimePlatform.OSXEditor, RuntimePlatform.LinuxEditor, - RuntimePlatform.LinuxPlayer, RuntimePlatform.IPhonePlayer + RuntimePlatform.LinuxPlayer, RuntimePlatform.IPhonePlayer, RuntimePlatform.Android })] public IEnumerator SetCodec() { @@ -444,7 +444,7 @@ public IEnumerator AddSource() // todo:: Crash in dispose process on Linux standalone // todo:: Timeout error on iPhonePlayer [UnityTest, Timeout(10000)] - [UnityPlatform(exclude = new[] { RuntimePlatform.LinuxPlayer, RuntimePlatform.IPhonePlayer })] + [UnityPlatform(exclude = new[] { RuntimePlatform.LinuxPlayer, RuntimePlatform.IPhonePlayer, RuntimePlatform.Android })] public IEnumerator ReceiveStream() { string connectionId = "12345"; @@ -566,7 +566,7 @@ public IEnumerator ReceiveDataChannel() } [UnityTest, Timeout(10000)] - [UnityPlatform(exclude = new[] { RuntimePlatform.LinuxPlayer })] + [UnityPlatform(exclude = new[] { RuntimePlatform.LinuxPlayer, RuntimePlatform.Android })] public IEnumerator AssignTransceivers() { string connectionId = "12345"; @@ -676,7 +676,7 @@ public IEnumerator AssignTransceivers() [UnityPlatform(exclude = new[] { RuntimePlatform.WindowsEditor, RuntimePlatform.OSXEditor, RuntimePlatform.LinuxEditor, - RuntimePlatform.LinuxPlayer + RuntimePlatform.LinuxPlayer, RuntimePlatform.Android })] public IEnumerator SetCodecOnSender() { @@ -782,7 +782,7 @@ public IEnumerator SetCodecOnSender() [UnityPlatform(exclude = new[] { RuntimePlatform.WindowsEditor, RuntimePlatform.OSXEditor, RuntimePlatform.LinuxEditor, - RuntimePlatform.LinuxPlayer + RuntimePlatform.LinuxPlayer, RuntimePlatform.Android })] public IEnumerator SetCodecOnReceiver() { diff --git a/com.unity.renderstreaming/package.json b/com.unity.renderstreaming/package.json index b3ce2f8af..c1e6a5a9f 100644 --- 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.", "dependencies": { - "com.unity.webrtc": "3.0.0-pre.3", + "com.unity.webrtc": "3.0.0-pre.4", "com.unity.inputsystem": "1.4.4", "com.unity.ugui": "1.0.0", "com.unity.modules.screencapture": "1.0.0"