delta compat with 6.00

Author: MartinPulec

src/deltacast_common.cpp

@@ -51,7 +51,7 @@
 #include "utils/color_out.h"
 #include "video_frame.h"         // for get_interlacing_suffix
 
-#if !defined VHD_MIN_6_00
+#if !defined VHD_MIN_6_19
 #define VHD_GetPCIeIdentificationString(BoardIndex, pIdString_c) \
         snprintf_ch(pIdString_c, "UNKNOWN")
 #endif
@@ -204,9 +204,11 @@ delta_get_error_description(ULONG CodeError)
 #ifdef VHD_MIN_6_00
         case VHDERR_INVALIDACCESSRIGHT:
                 return "Invalid access right";
+#endif // defined VHD_MIN_6_00
+#ifdef VHD_MIN_6_19
         case VHDERR_INVALIDCAPABILITY:
                 return "Invalid capability index";
-#endif // defined VHD_MIN_6_00
+#endif // defined VHD_MIN_6_19
 #ifdef DELTA_DVI_DEPRECATED
         case VHDERR_DEPRECATED:
                 return "Symbol is deprecated";
@@ -366,7 +368,7 @@ print_board_info(int BoardIndex, ULONG DllVersion, bool full)
                              &NbRxChannels);
         VHD_GetBoardProperty(BoardHandle, VHD_CORE_BP_NB_TXCHANNELS,
                              &NbTxChannels);
-#if defined VHD_MIN_6_00
+#if defined VHD_MIN_6_19
         VHD_GetBoardProperty(BoardHandle, VHD_CORE_BP_PRODUCT_VERSION,
                              &ProductVersion);
 #endif
@@ -713,7 +715,7 @@ delta_set_loopback_state(HANDLE BoardHandle, int ChannelIndex, BOOL32 State)
         }
 }
 
-#if !defined VHD_MIN_6_00
+#if !defined VHD_MIN_6_13
 struct deltacast_mode_info {
         unsigned int       width;
         unsigned int       height;
@@ -1056,6 +1058,8 @@ delta_board_type_is_dv(VHD_BOARDTYPE         BoardType,
         case VHD_BOARDTYPE_ASI: return false;
 #if defined VHD_MIN_6_00
         case VHD_BOARDTYPE_IP: return false;
+#endif
+#if defined VHD_MIN_6_13
         case VHD_BOARDTYPE_HDMI20: return true;
         case VHD_BOARDTYPE_FLEX_DP: return include_mixed;
         case VHD_BOARDTYPE_FLEX_SDI: return false;

src/deltacast_common.hpp

@@ -100,8 +100,12 @@
 
 #include "types.h"
 
+#if defined ENUMBASE_DV
+#define VHD_MIN_6_13 1
+#endif
+
 #if defined VHD_DV_SP_INPUT_CS // (VideoMasterHD 6.14)
-#define DELTA_DVI_DEPRECATED 1
+#define VHD_MIN_6_14 1
 #endif
 
 // VHD_MIN_X_YZ defined below means that the SDK version is at least X.YZ
@@ -137,27 +141,26 @@
 #endif
 
 // compat
-#ifdef DELTA_DVI_DEPRECATED
+#ifdef VHD_MIN_6_14
 #define VHD_BOARDTYPE_DVI VHD_BOARDTYPE_DVI_DEPRECATED
 #define VHD_BOARDTYPE_HDKEY VHD_BOARDTYPE_HDKEY_DEPRECATED
 #endif
 // Following items have been actually deprecated in 6.20. But 6.20 doesn't
 // bring any new define and thus it is undistinguishable from 6.19. As a
 // consequence, it won't compile with 6.19.
 #if defined VHD_MIN_6_20
-#define VHD_BOARDTYPE_SD VHD_BOARDTYPE_SD_DEPRECATED
-#define VHD_BOARDTYPE_SDKEY VHD_BOARDTYPE_SDKEY_DEPRECATED
-#define VHD_CHNTYPE_SDSDI VHD_CHNTYPE_SDSDI_DEPRECATED
-#ifndef VHD_CORE_BP_BYPASS_RELAY_0 // not defined in 6.20
-// VHD_BOARDTYPE_HDMI is not deprecated anymore in 6.21
-#define VHD_BOARDTYPE_HDMI VHD_BOARDTYPE_HDMI_DEPRECATED
-#endif
+        #define VHD_BOARDTYPE_SD VHD_BOARDTYPE_SD_DEPRECATED
+        #define VHD_BOARDTYPE_SDKEY VHD_BOARDTYPE_SDKEY_DEPRECATED
+        #define VHD_CHNTYPE_SDSDI VHD_CHNTYPE_SDSDI_DEPRECATED
+        #if !defined VHD_MIN_6_21 // HDMI deprecatedd just in 6.20
+                #define VHD_BOARDTYPE_HDMI VHD_BOARDTYPE_HDMI_DEPRECATED
+        #endif
 #else
         #define VHD_CHNTYPE_3GSDI_ASI VHD_CHNTYPE_DISABLE
         #define VHD_CHNTYPE_12GSDI_ASI VHD_CHNTYPE_DISABLE
 #endif // not defined VHD_MIN_6_20
 
-#if defined VHD_MIN_6_00
+#if defined VHD_MIN_6_13
         #define VHD_BOARDTYPE_FLEX VHD_BOARDTYPE_FLEX_DEPRECATED
 #else
         #define VHD_CHNTYPE_12GSDI VHD_CHNTYPE_DISABLE

src/video_capture/deltacast_dvi.cpp

@@ -93,7 +93,7 @@ struct vidcap_deltacast_dvi_state {
 #define BADEEDID 1
 
 // compat
-#if !defined VHD_MIN_6_00
+#if !defined VHD_MIN_6_13
 #define VHD_DV_EEDID_PRESET VHD_DVI_EEDID_PRESET
 #define VHD_DV_EEDID_EMPTY VHD_EEDID_EMPTY
 #define VHD_DV_EEDID_DVIA VHD_EEDID_DVIA
@@ -126,7 +126,7 @@ struct vidcap_deltacast_dvi_state {
 #define NB_VHD_DV_MODES NB_VHD_DVI_MODES
 #endif
 
-#if defined DELTA_DVI_DEPRECATED
+#if defined VHD_MIN_6_14
 #define VHD_DV_EEDID_DVIA VHD_DV_EEDID_DVIA_DEPRECATED
 #define VHD_DV_MODE_DVI_A VHD_DV_MODE_DVI_A_DEPRECATED
 #define VHD_DV_MODE_ANALOG_COMPONENT_VIDEO VHD_DV_MODE_ANALOG_COMPONENT_VIDEO_DEPRECATED
@@ -150,7 +150,7 @@ get_edid_preset_name(VHD_DV_EEDID_PRESET preset)
         case VHD_DV_EEDID_DVID_DUAL:      return  "DVI-D E-EDID with dual-link formats";
         case VHD_DV_EEDID_HDMI_H4K:       return  "HDMI H4K E-EDID";
         case VHD_DV_EEDID_DVID_H4K:       return  "DVI-D H4K E-EDID";
-#if defined VHD_MIN_6_00
+#if defined VHD_MIN_6_13
        case  VHD_DV_EEDID_HDMI_H4K2:       return "HDMI H4K2 E-EDID";
        case  VHD_DV_EEDID_DVID_H4K2:       return "DVI-D H4K2 E-EDID";
        case  VHD_DV_EEDID_DISPLAYPORT_1_2: return "DisplayPort 1.2 E-EDID";
@@ -312,7 +312,7 @@ static bool wait_for_channel_locked(struct vidcap_deltacast_dvi_state *s, bool h
                            standard. Manual setting or overriding of these properties is allowed
                            Resolution, refresh rate and graphic timing standard can be auto-detect
                            with VHD_DetectDviAFormat function */
-#if ! defined DELTA_DVI_DEPRECATED
+#if ! defined VHD_MIN_6_14
                         Result = VHD_DetectDviAFormat(s->StreamHandle,&DviAStd,&Width,&Height,&RefreshRate,
                                         &Interlaced_B);
 #else