Merge pull request #407 from DolbyIO/disco_crash

Ignore new frames instead of destroying SDK during subsystem deinitia…
voxeet · Sep 18, 2023 · 0a1cd97 · 0a1cd97
2 parents cb386de + d134cdf
commit 0a1cd97
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 1 deletion.
diff --git a/DolbyIO/Source/Private/DolbyIOSubsystem.cpp b/DolbyIO/Source/Private/DolbyIOSubsystem.cpp
@@ -53,7 +53,11 @@ void UDolbyIOSubsystem::Initialize(FSubsystemCollectionBase& Collection)
 
 void UDolbyIOSubsystem::Deinitialize()
 {
-	Sdk.Reset(); // make sure Sdk is dead so it doesn't call handle_frame on VideoSink during game destruction
+	DLB_UE_LOG("Deinitializing");
+	for (auto& Sink : VideoSinks)
+	{
+		Sink.Value->Disable(); // ignore new frames now on
+	}
 
 	Super::Deinitialize();
 }

diff --git a/DolbyIO/Source/Private/DolbyIOVideoSink.cpp b/DolbyIO/Source/Private/DolbyIOVideoSink.cpp
@@ -78,8 +78,18 @@ namespace DolbyIO
 		          });
 	}
 
+	void FVideoSink::Disable()
+	{
+		bIsEnabled = false;
+	}
+
 	void FVideoSink::handle_frame(const video_frame& VideoFrame)
 	{
+		if (!bIsEnabled)
+		{
+			return;
+		}
+
 		!Texture ? CreateTexture(VideoFrame.width(), VideoFrame.height())
 		         : ResizeTexture(VideoFrame.width(), VideoFrame.height());
 		Convert(VideoFrame);

diff --git a/DolbyIO/Source/Private/DolbyIOVideoSink.h b/DolbyIO/Source/Private/DolbyIOVideoSink.h
@@ -25,6 +25,7 @@ namespace DolbyIO
 		void BindMaterial(UMaterialInstanceDynamic* Material);
 		void UnbindMaterial(UMaterialInstanceDynamic* Material);
 		void UnbindAllMaterials();
+		void Disable();
 
 	private:
 		void handle_frame(const dolbyio::comms::video_frame&) override;
@@ -37,5 +38,6 @@ namespace DolbyIO
 		TSet<UMaterialInstanceDynamic*> Materials;
 		const FString VideoTrackID;
 		FOnTextureCreated OnTexCreated = [] {};
+		bool bIsEnabled = true;
 	};
 }