Merge pull request mipops#864 from MediaArea/signalstats

DeckLink Input: Add frame saturation statistics
MediaArea · Jun 17, 2024 · c43c820 · c43c820
2 parents 7a610ef + 3271ed3
commit c43c820
Show file tree

Hide file tree

Showing 18 changed files with 557 additions and 64 deletions.
diff --git a/Project/GNU/CLI/Makefile.am b/Project/GNU/CLI/Makefile.am
@@ -53,14 +53,17 @@ if BUILD_AVFCTL
 endif
 
 if BUILD_DECKLINK
-    dvrescue_SOURCES += ../../../Source/Common/DecklinkWrapper.cpp
+    dvrescue_SOURCES += ../../../Source/Common/DecklinkWrapper.cpp \
+                        ../../../Source/Common/Output_Mkv.cpp \
+                        ../../../Source/Common/SignalStats.cpp
 endif
 
 if BUILD_DECKLINK
-    dvrescue_SOURCES += ../../../Source/Common/Output_Mkv.cpp
+
 else
 if BUILD_SIMULATOR
-    dvrescue_SOURCES += ../../../Source/Common/Output_Mkv.cpp
+    dvrescue_SOURCES += ../../../Source/Common/Output_Mkv.cpp \
+                        ../../../Source/Common/SignalStats.cpp
 endif
 endif
 

diff --git a/Project/MSVC2017/CLI/DVRescue.vcxproj b/Project/MSVC2017/CLI/DVRescue.vcxproj
@@ -161,6 +161,7 @@
     <ClCompile Include="..\..\..\Source\Common\Output_Webvtt.cpp" />
     <ClCompile Include="..\..\..\Source\Common\Output_Xml.cpp" />
     <ClCompile Include="..\..\..\Source\Common\Output_Mkv.cpp" />
+    <ClCompile Include="..\..\..\Source\Common\SignalStats.cpp" />
     <ClCompile Include="..\..\..\Source\Common\ProcessFile.cpp" />
     <ClCompile Include="..\..\..\Source\Common\ProcessFileWrapper.cpp" />
     <ClCompile Include="..\..\..\Source\Common\SimulatorWrapper.cpp" />
@@ -184,6 +185,7 @@
     <ClInclude Include="..\..\..\Source\Common\Output_Webvtt.h" />
     <ClInclude Include="..\..\..\Source\Common\Output_Xml.h" />
     <ClInclude Include="..\..\..\Source\Common\Output_Mkv.h" />
+    <ClInclude Include="..\..\..\Source\Common\SignalStats.h" />
     <ClInclude Include="..\..\..\Source\Common\ProcessFile.h" />
     <ClInclude Include="..\..\..\Source\Common\ProcessFileWrapper.h" />
     <ClInclude Include="..\..\..\Source\Common\SimulatorWrapper.h" />

diff --git a/Project/MSVC2019/CLI/DVRescue.vcxproj b/Project/MSVC2019/CLI/DVRescue.vcxproj
@@ -162,6 +162,7 @@
     <ClCompile Include="..\..\..\Source\Common\Output_Webvtt.cpp" />
     <ClCompile Include="..\..\..\Source\Common\Output_Xml.cpp" />
     <ClCompile Include="..\..\..\Source\Common\Output_Mkv.cpp" />
+    <ClCompile Include="..\..\..\Source\Common\SignalStats.cpp" />
     <ClCompile Include="..\..\..\Source\Common\ProcessFile.cpp" />
     <ClCompile Include="..\..\..\Source\Common\ProcessFileWrapper.cpp" />
     <ClCompile Include="..\..\..\Source\Common\SimulatorWrapper.cpp" />
@@ -185,6 +186,7 @@
     <ClInclude Include="..\..\..\Source\Common\Output_Webvtt.h" />
     <ClInclude Include="..\..\..\Source\Common\Output_Xml.h" />
     <ClInclude Include="..\..\..\Source\Common\Output_Mkv.h" />
+    <ClInclude Include="..\..\..\Source\Common\SignalStats.h" />
     <ClInclude Include="..\..\..\Source\Common\ProcessFile.h" />
     <ClInclude Include="..\..\..\Source\Common\ProcessFileWrapper.h" />
     <ClInclude Include="..\..\..\Source\Common\SimulatorWrapper.h" />

diff --git a/Project/MSVC2022/CLI/DVRescue.vcxproj b/Project/MSVC2022/CLI/DVRescue.vcxproj
@@ -162,6 +162,7 @@
     <ClCompile Include="..\..\..\Source\Common\Output_Webvtt.cpp" />
     <ClCompile Include="..\..\..\Source\Common\Output_Xml.cpp" />
     <ClCompile Include="..\..\..\Source\Common\Output_Mkv.cpp" />
+    <ClCompile Include="..\..\..\Source\Common\SignalStats.cpp" />
     <ClCompile Include="..\..\..\Source\Common\ProcessFile.cpp" />
     <ClCompile Include="..\..\..\Source\Common\ProcessFileWrapper.cpp" />
     <ClCompile Include="..\..\..\Source\Common\SimulatorWrapper.cpp" />
@@ -185,6 +186,7 @@
     <ClInclude Include="..\..\..\Source\Common\Output_Webvtt.h" />
     <ClInclude Include="..\..\..\Source\Common\Output_Xml.h" />
     <ClInclude Include="..\..\..\Source\Common\Output_Mkv.h" />
+    <ClInclude Include="..\..\..\Source\Common\SignalStats.h" />
     <ClInclude Include="..\..\..\Source\Common\ProcessFile.h" />
     <ClInclude Include="..\..\..\Source\Common\ProcessFileWrapper.h" />
     <ClInclude Include="..\..\..\Source\Common\SimulatorWrapper.h" />

diff --git a/Source/Common/DecklinkWrapper.cpp b/Source/Common/DecklinkWrapper.cpp
@@ -43,6 +43,17 @@ static uint32_t decklink_audio_sources[Decklink_Audio_Source_Max] =
     bmdAudioConnectionMicrophone
 };
 
+//---------------------------------------------------------------------------
+static uint32_t decklink_pixel_formats[Decklink_Pixel_Format_Max] =
+{
+    bmdFormatUnspecified,
+    bmdFormat8BitYUV,
+    bmdFormat10BitYUV,
+    bmdFormat8BitARGB,
+    bmdFormat8BitBGRA,
+    bmdFormat10BitRGB
+};
+
 //---------------------------------------------------------------------------
 static uint32_t decklink_timecode_formats[Decklink_Timecode_Format_Max] =
 {
@@ -129,9 +140,26 @@ HRESULT DecklinkWrapper::CaptureDelegate::VideoInputFrameArrived(IDeckLinkVideoI
             }
         }
 
+        uint8_t PixelFormat = (uint8_t)Decklink_Pixel_Format_Unspecified;
+        switch (VideoFrame->GetPixelFormat())
+        {
+            case bmdFormat8BitYUV:
+                PixelFormat = (uint8_t)Decklink_Pixel_Format_8BitYUV; break;
+            case bmdFormat10BitYUV:
+                PixelFormat = (uint8_t)Decklink_Pixel_Format_10BitYUV; break;
+            case bmdFormat8BitARGB:
+                PixelFormat = (uint8_t)Decklink_Pixel_Format_8BitARGB; break;
+            case bmdFormat8BitBGRA:
+                PixelFormat = (uint8_t)Decklink_Pixel_Format_8BitBGRA; break;
+            case bmdFormat10BitRGB:
+                PixelFormat = (uint8_t)Decklink_Pixel_Format_10BitRGB; break;
+            default:;
+        }
+
         decklink_frame Buffer = {
             .Width = (uint32_t)VideoFrame->GetWidth(),
             .Height = (uint32_t)VideoFrame->GetHeight(),
+            .Pixel_Format = PixelFormat,
             .Video_Buffer = (uint8_t*)VideoBuffer,
             .Video_Buffer_Size = VideoBufferSize,
             .Audio_Buffer = (uint8_t*)AudioBuffer,

diff --git a/Source/Common/Merge.h b/Source/Common/Merge.h
@@ -28,6 +28,7 @@ extern const char* Control_Port;
 extern uint8_t DeckLinkVideoMode;
 extern uint8_t DeckLinkVideoSource;
 extern uint8_t DeckLinkAudioSource;
+extern uint8_t DeckLinkPixelFormat;
 extern uint8_t DeckLinkTimecodeFormat;
 #endif
 extern size_t Merge_Rewind_Count;