fix: Fix crash on Android pixel4a with vulkan (#874)

* fix crash on android pixel4a with vulkan * fix bug * fix code format * fix unittest error * fix crash of H.264 hw codec * [skip ci] Update plugins
Unity-Technologies · Jan 16, 2023 · 9188e54 · 9188e54
1 parent 7481842
commit 9188e54
Show file tree

Hide file tree

Showing 12 changed files with 20 additions and 18 deletions.
diff --git a/Plugin~/WebRTCPlugin/Codec/NvCodec/NvEncoderImpl.cpp b/Plugin~/WebRTCPlugin/Codec/NvCodec/NvEncoderImpl.cpp
@@ -396,7 +396,12 @@ namespace webrtc
         if (!m_encodedCompleteCallback)
             return WEBRTC_VIDEO_CODEC_UNINITIALIZED;
 
-        auto videoFrameBuffer = static_cast<ScalableBufferInterface*>(frame.video_frame_buffer().get());
+        auto frameBuffer = frame.video_frame_buffer();
+        if (frameBuffer->type() != VideoFrameBuffer::Type::kNative || frameBuffer->width() != m_codec.width ||
+            frameBuffer->height() != m_codec.height)
+            return WEBRTC_VIDEO_CODEC_ERR_PARAMETER;
+
+        auto videoFrameBuffer = static_cast<ScalableBufferInterface*>(frameBuffer.get());
         rtc::scoped_refptr<VideoFrame> video_frame = videoFrameBuffer->scaled()
             ? static_cast<VideoFrameAdapter::ScaledBuffer*>(videoFrameBuffer)->GetVideoFrame()
             : static_cast<VideoFrameAdapter*>(videoFrameBuffer)->GetVideoFrame();

diff --git a/Plugin~/WebRTCPlugin/GpuMemoryBuffer.cpp b/Plugin~/WebRTCPlugin/GpuMemoryBuffer.cpp
@@ -41,16 +41,19 @@ namespace webrtc
 
     GpuMemoryBufferFromUnity::~GpuMemoryBufferFromUnity() { }
 
-    void GpuMemoryBufferFromUnity::ResetSync()
+    bool GpuMemoryBufferFromUnity::ResetSync()
     {
         if (!device_->ResetSync(texture_.get()))
         {
             RTC_LOG(LS_INFO) << "ResetSync failed.";
+            return false;
         }
         if (!device_->ResetSync(textureCpuRead_.get()))
         {
             RTC_LOG(LS_INFO) << "ResetSync failed.";
+            return false;
         }
+        return true;
     }
 
     void GpuMemoryBufferFromUnity::CopyBuffer(NativeTexPtr ptr)

diff --git a/Plugin~/WebRTCPlugin/GpuMemoryBuffer.h b/Plugin~/WebRTCPlugin/GpuMemoryBuffer.h
@@ -50,7 +50,7 @@ namespace webrtc
         GpuMemoryBufferFromUnity(const GpuMemoryBufferFromUnity&) = delete;
         GpuMemoryBufferFromUnity& operator=(const GpuMemoryBufferFromUnity&) = delete;
 
-        void ResetSync();
+        bool ResetSync();
         void CopyBuffer(NativeTexPtr ptr);
         UnityRenderingExtTextureFormat GetFormat() const override;
         Size GetSize() const override;

diff --git a/Plugin~/WebRTCPlugin/GpuMemoryBufferPool.cpp b/Plugin~/WebRTCPlugin/GpuMemoryBufferPool.cpp
@@ -38,9 +38,13 @@ namespace webrtc
             FrameResources* resources = it->get();
             if (!resources->IsUsed() && AreFrameResourcesCompatible(resources, size, format))
             {
-                resources->MarkUsed(clock_->CurrentTime());
                 GpuMemoryBufferFromUnity* buffer = static_cast<GpuMemoryBufferFromUnity*>(resources->buffer_.get());
-                buffer->ResetSync();
+                if (!buffer->ResetSync())
+                {
+                    RTC_LOG(LS_INFO) << "It has not signaled yet";
+                    continue;
+                }
+                resources->MarkUsed(clock_->CurrentTime());
                 buffer->CopyBuffer(ptr);
                 return resources->buffer_;
             }

diff --git a/Plugin~/WebRTCPlugin/VideoFrameAdapter.cpp b/Plugin~/WebRTCPlugin/VideoFrameAdapter.cpp
@@ -39,18 +39,12 @@ namespace webrtc
 
     rtc::scoped_refptr<webrtc::I420BufferInterface> VideoFrameAdapter::ScaledBuffer::ToI420()
     {
-        auto buffer = parent_->GetOrCreateFrameBufferForSize(Size(width_, height_));
-        if(!buffer)
-            return nullptr;
-        return buffer->ToI420();
+        return parent_->GetOrCreateFrameBufferForSize(Size(width_, height_))->ToI420();
     }
 
     const I420BufferInterface* VideoFrameAdapter::ScaledBuffer::GetI420() const
     {
-        auto buffer = parent_->GetOrCreateFrameBufferForSize(Size(width_, height_));
-        if(!buffer)
-            return nullptr;
-        return buffer->GetI420();
+        return parent_->GetOrCreateFrameBufferForSize(Size(width_, height_))->GetI420();
     }
 
     rtc::scoped_refptr<VideoFrameBuffer>
@@ -117,7 +111,6 @@ namespace webrtc
         }
         auto buffer = VideoFrameBuffer::CropAndScale(0, 0, width(), height(), size.width(), size.height());
         scaledI40Buffers_.push_back(buffer);
-        RTC_LOG(LS_INFO) << "size.width:" << size.width() << " size.height:" << size.height();
         return buffer;
     }
 

diff --git a/Runtime/Plugins/Android/libwebrtc.aar b/Runtime/Plugins/Android/libwebrtc.aar
diff --git a/Runtime/Plugins/iOS/webrtc.framework/webrtc b/Runtime/Plugins/iOS/webrtc.framework/webrtc
diff --git a/Runtime/Plugins/macOS/libwebrtc.dylib b/Runtime/Plugins/macOS/libwebrtc.dylib
diff --git a/Runtime/Plugins/x86_64/libwebrtc.so b/Runtime/Plugins/x86_64/libwebrtc.so
diff --git a/Runtime/Plugins/x86_64/webrtc.dll b/Runtime/Plugins/x86_64/webrtc.dll
diff --git a/Tests/Runtime/StatsReportTest.cs b/Tests/Runtime/StatsReportTest.cs
@@ -290,9 +290,6 @@ public static void Test(RTCStats stats)
                     Ignore.Pass(sentRtpStats.packetsSent);
                     Ignore.Pass(sentRtpStats.bytesSent);
                     break;
-                default:
-                    Debug.LogWarning(stats.Type);
-                    break;
             }
         }
     }

diff --git a/Tests/Runtime/VideoReceiveTest.cs b/Tests/Runtime/VideoReceiveTest.cs
@@ -98,7 +98,7 @@ IEnumerator VideoReceive()
                 var receiveVideoTrack = test.component.RecvVideoTrack;
                 Assert.That(receiveVideoTrack, Is.Not.Null);
 
-                yield return new WaitUntilWithTimeout(() => receiveVideoTrack.Texture != null, 5000);
+                yield return new WaitUntilWithTimeout(() => receiveVideoTrack.Texture != null, 15000);
                 Assert.That(receiveVideoTrack.Texture, Is.Not.Null);
                 test.component.Clear();
             }