VertexStudio · rozgo · Aug 16, 2019 · Aug 17, 2019 · Aug 17, 2019 · Aug 22, 2019
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,2 @@
+Binaries
+Intermediate
diff --git a/GStreamer/GStreamer.uplugin b/GStreamer/GStreamer.uplugin
@@ -1,25 +1,29 @@
-{
-  "FileVersion": 3,
-  "Version": 1,
-  "VersionName": "0.0.1",
-  "FriendlyName": "GStreamer",
-  "Description": "",
-  "CreatedBy": "",
-  "CreatedByURL": "",
-  "DocsURL": "",
-  "Category": "Media",
-  "CanContainContent": true,
-  "Modules": [
-    {
-      "Name": "GStreamer",
-      "Type": "Runtime",
-      "LoadingPhase": "PostEngineInit"
-    }
-  ],
-  "Plugins": [
-    {
-      "Name": "GStreamerLoader",
-      "Enabled": true
-    }
-  ]
-}
+{
+	"FileVersion": 3,
+	"Version": 1,
+	"VersionName": "0.0.1",
+	"FriendlyName": "GStreamer",
+	"Description": "",
+	"Category": "Simbotic",
+	"CreatedBy": "",
+	"CreatedByURL": "",
+	"DocsURL": "",
+	"MarketplaceURL": "",
+	"SupportURL": "",
+	"CanContainContent": true,
+	"IsBetaVersion": false,
+	"Installed": false,
+	"Modules": [
+		{
+			"Name": "GStreamer",
+			"Type": "Runtime",
+			"LoadingPhase": "PostEngineInit"
+		}
+	],
+	"Plugins": [
+		{
+			"Name": "GStreamerLoader",
+			"Enabled": true
+		}
+	]
+}
diff --git a/GStreamer/Source/GStreamer/Private/GstAppSinkComponent.h b/GStreamer/Source/GStreamer/Private/GstAppSinkComponent.h
@@ -8,7 +8,7 @@
 
 DECLARE_DYNAMIC_MULTICAST_DELEGATE_FiveParams(FGstTextureCreatedSignature, UGstAppSinkComponent*, AppSink, UTexture2D*, NewTexture, EGstVideoFormat, Format, int, Width, int, Height);
 
-UCLASS( ClassGroup=(Custom), meta=(BlueprintSpawnableComponent) )
+UCLASS( ClassGroup=(Simbotic), meta=(BlueprintSpawnableComponent) )
 class GSTREAMER_API UGstAppSinkComponent : public UGstElementComponent, public IGstAppSinkCallback, public IGstTextureCallback
 {
 	GENERATED_BODY()

diff --git a/GStreamer/Source/GStreamer/Private/GstAppSrcComponent.cpp b/GStreamer/Source/GStreamer/Private/GstAppSrcComponent.cpp
@@ -48,10 +48,17 @@ void UGstAppSrcComponent::TickComponent(float DeltaTime, ELevelTick TickType, FA
 		{
 			USceneCaptureComponent2D *CaptureComponent = Cast<USceneCaptureComponent2D>(ComponentReference.GetComponent(Actor));
 			UTextureRenderTarget2D *TextureTarget = CaptureComponent->TextureTarget;
-			TArray<FColor> TextureData;
-			FTextureRenderTargetResource *TextureResource = TextureTarget->GameThread_GetRenderTargetResource();
-			TextureResource->ReadPixels(TextureData);
-			AppSrc->PushTexture((uint8_t *)TextureData.GetData(), TextureData.Num() * 4);
+			if (TextureTarget)
+			{
+				TArray<FColor> TextureData;
+				FTextureRenderTargetResource *TextureResource = TextureTarget->GameThread_GetRenderTargetResource();
+				TextureResource->ReadPixels(TextureData);
+				AppSrc->PushTexture((uint8_t *)TextureData.GetData(), TextureData.Num() * 4);
+			}
+			else
+			{
+				GST_LOG_ERR(TEXT("GstAppSrc: Missing TextureTarget"));
+			}
 		}
 	}
 }
diff --git a/GStreamer/Source/GStreamer/Private/GstAppSrcComponent.h b/GStreamer/Source/GStreamer/Private/GstAppSrcComponent.h
@@ -5,7 +5,7 @@
 #include "GstVideoFormat.h"
 #include "GstAppSrcComponent.generated.h"
 
-UCLASS(ClassGroup = (Custom), meta = (BlueprintSpawnableComponent))
+UCLASS(ClassGroup = (Simbotic), meta = (BlueprintSpawnableComponent))
 class GSTREAMER_API UGstAppSrcComponent : public UGstElementComponent
 {
 	GENERATED_BODY()

diff --git a/GStreamer/Source/GStreamer/Private/GstElementComponent.h b/GStreamer/Source/GStreamer/Private/GstElementComponent.h
@@ -4,7 +4,7 @@
 #include "Components/SceneComponent.h"
 #include "GstElementComponent.generated.h"
 
-UCLASS( ClassGroup=(Custom) )
+UCLASS( ClassGroup=(Simbotic) )
 class GSTREAMER_API UGstElementComponent : public UActorComponent
 {
 	GENERATED_BODY()

diff --git a/GStreamer/Source/GStreamer/Private/GstPipelineComponent.h b/GStreamer/Source/GStreamer/Private/GstPipelineComponent.h
@@ -4,7 +4,7 @@
 #include "GstPipelineImpl.h"
 #include "GstPipelineComponent.generated.h"
 
-UCLASS( ClassGroup=(Custom), meta=(BlueprintSpawnableComponent) )
+UCLASS( ClassGroup=(Simbotic), meta=(BlueprintSpawnableComponent) )
 class GSTREAMER_API UGstPipelineComponent : public UGstElementComponent
 {
 	GENERATED_BODY()

diff --git a/GStreamer/Source/GStreamer/Private/GstTexture.cpp b/GStreamer/Source/GStreamer/Private/GstTexture.cpp
@@ -62,10 +62,8 @@ void FGstTexture::TickGameThread()
 		if (m_TextureObject)
 		{
 			// render commands should be submitted only from game thread
-			ENQUEUE_UNIQUE_RENDER_COMMAND_TWOPARAMETER(
-				UpdateTextureCmd,
-				FGstTexture*, Context, this,
-				IGstSample*, Sample, Sample,
+			FGstTexture* Context = this;
+			ENQUEUE_RENDER_COMMAND(UpdateTextureCmd)([Context, Sample](FRHICommandListImmediate& RHICmdList)
 			{
 				Context->RenderCmd_UpdateTexture(Sample);
 			});
@@ -146,9 +144,8 @@ void FGstTexture::Resize(IGstSample* Sample)
 		m_Height = Sample->GetHeight();
 		m_Pitch = m_Width * GPixelFormats[m_UeFormat].BlockBytes;
 
-		ENQUEUE_UNIQUE_RENDER_COMMAND_ONEPARAMETER(
-			CreateTextureCmd,
-			FGstTexture*, Context, this,
+		FGstTexture* Context = this;
+		ENQUEUE_RENDER_COMMAND(CreateTextureCmd)([Context](FRHICommandListImmediate& RHICmdList)
 		{
 			Context->RenderCmd_CreateTexture();
 		});

diff --git a/GStreamer/Source/GStreamer/Public/GStreamerModule.h b/GStreamer/Source/GStreamer/Public/GStreamerModule.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "ModuleManager.h"
+#include "Modules/ModuleManager.h"
 
 class GSTREAMER_API IGStreamerModule : public IModuleInterface
 {

diff --git a/GStreamerLoader/GStreamerLoader.uplugin b/GStreamerLoader/GStreamerLoader.uplugin
@@ -1,20 +1,23 @@
-{
-	"FileVersion" : 3,
-	"Version" : 1,
-	"VersionName" : "0.0.1",
-	"FriendlyName" : "GStreamerLoader",
-	"Description" : "",
-	"CreatedBy" : "",
-	"CreatedByURL" : "",
-	"DocsURL" : "",
-	"Category" : "Media",
-	"CanContainContent" : false,
-	"Modules" :
-	[
-		{
-			"Name" : "GStreamerLoader",
-			"Type": "Runtime",
-			"LoadingPhase" : "PostConfigInit"
-		}
-	]
-}
+{
+	"FileVersion": 3,
+	"Version": 1,
+	"VersionName": "0.0.1",
+	"FriendlyName": "GStreamerLoader",
+	"Description": "",
+	"Category": "Simbotic",
+	"CreatedBy": "",
+	"CreatedByURL": "",
+	"DocsURL": "",
+	"MarketplaceURL": "",
+	"SupportURL": "",
+	"CanContainContent": false,
+	"IsBetaVersion": false,
+	"Installed": false,
+	"Modules": [
+		{
+			"Name": "GStreamerLoader",
+			"Type": "Runtime",
+			"LoadingPhase": "PostConfigInit"
+		}
+	]
+}
diff --git a/GStreamerLoader/Source/GStreamerLoader/Public/GStreamerLoaderModule.h b/GStreamerLoader/Source/GStreamerLoader/Public/GStreamerLoaderModule.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "ModuleManager.h"
+#include "Modules/ModuleManager.h"
 
 class GSTREAMERLOADER_API IGStreamerLoaderModule : public IModuleInterface
 {

diff --git a/README.md b/README.md
@@ -2,18 +2,55 @@
 
 # Setup
 
-- Clone this repository:
+- Clone this repository in the `Plugins` directory of your UE4 project:
+
+```
+git clone [email protected]:Simbotic/ue4-gst-plugin.git
 ```
-git clone [email protected]:racsoraul/ue4-gst-plugin.git
+
+- Update your `.uproject` adding the `Engine` as additional dependency and the `GStreamer` plugin:
+
+```
+...,
+"Modules": [
+	{
+		"Name": "GST_Test",
+		"Type": "Runtime",
+		"LoadingPhase": "Default",
+		"AdditionalDependencies": [
+			"Engine"
+		]
+	}
+],
+"Plugins": [
+	{
+		"Name": "GStreamer",
+		"Enabled": true
+	},
+],
+...
+
+```
+- Add, in the constructors of the classes of your project: `Source/PROJECT_NAME.Target.cs` and `Source/PROJECT_NAMEEditor.Target.cs` the following:
+```
+bUseUnityBuild = false;
+bUsePCHFiles = false;
 ```
-- Copy content in the `Plugins` directory of your UE4 project.
 
 # Usage
 
 Blueprints:
 
 ![gst-plugin-ue4 blueprints](docs/media/gst_pipeline.png)
 
+GstAppSrc component:  
+
+![gst-plugin-ue4 blueprints](docs/media/GstAppSrc.png)
+
+GstPipeline component: 
+
+![gst-plugin-ue4 blueprints](docs/media/GstPipeline.png)
+
 Details panel:
 
 ![gst-plugin-ue4 details panel](docs/media/details_panel.png)
diff --git a/docs/media/GstAppSrc.png b/docs/media/GstAppSrc.png
diff --git a/docs/media/GstPipeline.png b/docs/media/GstPipeline.png
diff --git a/docs/media/details_panel.png b/docs/media/details_panel.png