fix: Fix SetTextureSize when using VideoSourceType.Texture (#885)

* fix SetTextureSize when using VideoSourceType.Texture * fix * fix * fix
Unity-Technologies · Feb 21, 2023 · b164082 · b164082
1 parent 0bebc23
commit b164082
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 10 deletions.
diff --git a/com.unity.renderstreaming/Editor/VideoStreamSenderEditor.cs b/com.unity.renderstreaming/Editor/VideoStreamSenderEditor.cs
@@ -120,7 +120,10 @@ private void HandleDataSourceField()
             EditorGUILayout.EndFadeGroup();
 
             if (EditorGUILayout.BeginFadeGroup(m_sourceFade[(int)VideoStreamSource.Texture].faded))
+            {
                 EditorGUILayout.PropertyField(m_texture);
+                EditorGUILayout.PropertyField(m_textureSize);
+            }
             EditorGUILayout.EndFadeGroup();
 
             if (EditorGUILayout.BeginFadeGroup(m_sourceFade[(int)VideoStreamSource.WebCamera].faded))

diff --git a/com.unity.renderstreaming/Runtime/Scripts/VideoStreamSender.cs b/com.unity.renderstreaming/Runtime/Scripts/VideoStreamSender.cs
@@ -423,8 +423,6 @@ public void SetScaleResolutionDown(float scaleFactor)
         /// <param name="size"></param>
         public void SetTextureSize(Vector2Int size)
         {
-            if (m_Source == VideoStreamSource.Texture)
-                throw new InvalidOperationException("Video source is set Texture.");
             m_TextureSize = size;
 
             if (!isPlaying)
@@ -581,7 +579,7 @@ public override WaitForCreateTrack CreateTrack()
 
                 GraphicsFormat format =
                     WebRTC.WebRTC.GetSupportedGraphicsFormat(SystemInfo.graphicsDeviceType);
-                if (m_texture.graphicsFormat == format)
+                if (m_texture.graphicsFormat == format && m_texture.width == width && m_texture.height == height)
                 {
                     instruction.Done(new VideoStreamTrack(m_texture));
                     return instruction;

diff --git a/com.unity.renderstreaming/Samples~/Example/Broadcast/BroadcastSample.cs b/com.unity.renderstreaming/Samples~/Example/Broadcast/BroadcastSample.cs
@@ -173,11 +173,8 @@ private void ChangeResolution(int index)
         {
             var resolution = resolutionOptions.Values.ElementAt(index);
 
-            if (videoStreamSender.source != VideoStreamSource.Texture)
-            {
-                videoStreamSender.SetTextureSize(resolution);
-                CalculateInputRegion();
-            }
+            videoStreamSender.SetTextureSize(resolution);
+            CalculateInputRegion();
         }
 
         private void Start()

diff --git a/com.unity.renderstreaming/Tests/Runtime/StreamingComponentTest.cs b/com.unity.renderstreaming/Tests/Runtime/StreamingComponentTest.cs
@@ -113,8 +113,8 @@ public IEnumerator CreateTrack()
             Assert.That(sender.sourceTexture, Is.Not.Null);
             Assert.That(sender.width, Is.EqualTo(width));
             Assert.That(sender.height, Is.EqualTo(height));
-            Assert.That(() => sender.width = 1280, Throws.Exception.TypeOf<InvalidOperationException>());
-            Assert.That(() => sender.height = 720, Throws.Exception.TypeOf<InvalidOperationException>());
+            Assert.That(() => sender.width = 1280, Throws.Nothing);
+            Assert.That(() => sender.height = 720, Throws.Nothing);
             op = sender.CreateTrack();
             yield return op;
             track = op.Track;