decklink fcc opt parse unified + moved to common

Author: MartinPulec

src/blackmagic_common.cpp

@@ -67,6 +67,7 @@
 #include "utils/color_out.h"
 #include "utils/debug.h"         // for DEBUG_TIMER_*
 #include "utils/macros.h"
+#include "utils/string.h"        // for DELDEL
 #include "utils/windows.h"
 #include "utils/worker.h"
 
@@ -1877,6 +1878,24 @@ bmd_unsubscribe_notify(BMDNotificationCallback *notificationCallback)
         notificationCallback->Release();
 }
 
+/// parse bmd_option from given arg in format FourCC[=val]
+bool
+bmd_parse_fourcc_arg(
+    map<BMDDeckLinkConfigurationID, bmd_option> &device_options,
+    const char                                  *arg)
+{
+        const char *val = nullptr;
+
+        char tmp[STR_LEN];
+        if (strchr(arg, '=') != nullptr) {
+                snprintf_ch(tmp, "%s", strchr(arg, '=') + 1);
+                replace_all(tmp, DELDEL, ":");
+                val = tmp;
+        }
+        return device_options[(BMDDeckLinkConfigurationID) bmd_read_fourcc(arg)]
+            .parse(val);
+}
+
 ADD_TO_PARAM(R10K_FULL_OPT, "* " R10K_FULL_OPT "\n"
                 "  Do not do conversion from/to limited range on in/out for R10k on BMD devs.\n");
 ADD_TO_PARAM(BMD_NAT_SORT, "* " BMD_NAT_SORT "\n"

src/blackmagic_common.hpp

@@ -201,5 +201,9 @@ bmd_print_status_subscribe_notify(IDeckLink *deckLink, const char *log_prefix,
                                   bool capture);
 void bmd_unsubscribe_notify(BMDNotificationCallback *notificationCallback);
 
+bool bmd_parse_fourcc_arg(
+    std::map<BMDDeckLinkConfigurationID, bmd_option> &device_options,
+    const char                                       *arg);
+
 #endif // defined BLACKMAGIC_COMMON_HPP
 

src/video_capture/decklink.cpp

@@ -791,17 +791,7 @@ static bool parse_option(struct vidcap_decklink_state *s, const char *opt)
         } else if (strstr(opt, "keep-settings") == opt) {
                 s->keep_device_defaults = true;
         } else if ((strchr(opt, '=') != nullptr && strchr(opt, '=') - opt == 4) || strlen(opt) == 4) {
-                char *val = nullptr;
-                char tmp[STR_LEN];
-                if (strchr(opt, '=') != nullptr) {
-                        snprintf_ch(tmp, "%s", strchr(opt, '=') + 1);
-                        replace_all(tmp, DELDEL, ":");
-                        val = tmp;
-                }
-                ret = s
-                          ->device_options[(
-                              BMDDeckLinkConfigurationID) bmd_read_fourcc(opt)]
-                          .parse(val);
+                ret = bmd_parse_fourcc_arg(s->device_options, opt);
         } else {
                 log_msg(LOG_LEVEL_ERROR, MOD_NAME "unknown option in init string: %s\n", opt);
                 return false;

src/video_display/decklink.cpp

@@ -1328,16 +1328,7 @@ static bool settings_init(struct state_decklink *s, const char *fmt,
                 } else if (strncasecmp(ptr, "targetbuffer=", strlen("targetbuffer=")) == 0) {
                         s->audio_drift_fixer.set_target_buffer(parse_uint32(strchr(ptr, '=') + 1));
                 } else if ((strchr(ptr, '=') != nullptr && strchr(ptr, '=') - ptr == 4) || strlen(ptr) == 4) {
-                        char *val = nullptr;
-                        char tmp[STR_LEN];
-                        if (strchr(ptr, '=') != nullptr) {
-                                snprintf_ch(tmp, "%s", strchr(ptr, '=') + 1);
-                                replace_all(tmp, DELDEL, ":");
-                                val = tmp;
-                        }
-                        ret &= s->device_options[(BMDDeckLinkConfigurationID)
-                                                     bmd_read_fourcc(ptr)]
-                                   .parse(val);
+                        ret &= bmd_parse_fourcc_arg(s->device_options, ptr);
                 } else {
                         log_msg(LOG_LEVEL_ERROR, MOD_NAME "unknown option in config string: %s\n", ptr);
                         return false;