Support DeckLink cards that don't have an HDMI connector.

[nageru] / decklink_capture.cpp

diff --git a/decklink_capture.cpp b/decklink_capture.cpp
index 2df01aa2dab80a069eb087bfa12b8365dd35a2b2..892660da09eb64793c8f1490baf5368ace61c31d 100644 (file)
--- a/decklink_capture.cpp
+++ b/decklink_capture.cpp
@@ -18,6 +18,7 @@
 #include <vector>
 
 #include "bmusb/bmusb.h"
+#include "decklink_util.h"
 
 #define FRAME_SIZE (8 << 20)  // 8 MB.
 
@@ -212,7 +213,9 @@ DeckLinkCapture::DeckLinkCapture(IDeckLink *card, int card_index)
                exit(1);
        }
 
-       set_video_input(bmdVideoConnectionHDMI);
+       BMDVideoConnection connection = pick_default_video_connection(card, BMDDeckLinkVideoInputConnections, card_index);
+
+       set_video_input(connection);
        set_audio_input(bmdAudioConnectionEmbedded);
 
        IDeckLinkDisplayModeIterator *mode_it;
@@ -221,36 +224,8 @@ DeckLinkCapture::DeckLinkCapture(IDeckLink *card, int card_index)
                exit(1);
        }
 
-       for (IDeckLinkDisplayMode *mode_ptr; mode_it->Next(&mode_ptr) == S_OK; mode_ptr->Release()) {
-               VideoMode mode;
-
-               const char *mode_name;
-               if (mode_ptr->GetName(&mode_name) != S_OK) {
-                       mode.name = "Unknown mode";
-               } else {
-                       mode.name = mode_name;
-               }
-
-               mode.autodetect = false;
-
-               mode.width = mode_ptr->GetWidth();
-               mode.height = mode_ptr->GetHeight();
-
-               BMDTimeScale frame_rate_num;
-               BMDTimeValue frame_rate_den;
-               if (mode_ptr->GetFrameRate(&frame_rate_den, &frame_rate_num) != S_OK) {
-                       fprintf(stderr, "Could not get frame rate for mode '%s' on card %d\n", mode.name.c_str(), card_index);
-                       exit(1);
-               }
-               mode.frame_rate_num = frame_rate_num;
-               mode.frame_rate_den = frame_rate_den;
-
-               // TODO: Respect the TFF/BFF flag.
-               mode.interlaced = (mode_ptr->GetFieldDominance() == bmdLowerFieldFirst || mode_ptr->GetFieldDominance() == bmdUpperFieldFirst);
-
-               uint32_t id = mode_ptr->GetDisplayMode();
-               video_modes.insert(make_pair(id, mode));
-       }
+       video_modes = summarize_video_modes(mode_it, card_index);
+       mode_it->Release();
 
        set_video_mode_no_restart(bmdModeHD720p5994);
 
@@ -294,6 +269,7 @@ HRESULT STDMETHODCALLTYPE DeckLinkCapture::VideoInputFormatChanged(
                fprintf(stderr, "Could not get new frame rate\n");
                exit(1);
        }
+       field_dominance = display_mode->GetFieldDominance();
        return S_OK;
 }
 
@@ -314,6 +290,9 @@ HRESULT STDMETHODCALLTYPE DeckLinkCapture::VideoInputFrameArrived(
 
        video_format.frame_rate_nom = time_scale;
        video_format.frame_rate_den = frame_duration;
+       // TODO: Respect the TFF/BFF flag.
+       video_format.interlaced = (field_dominance == bmdLowerFieldFirst || field_dominance == bmdUpperFieldFirst);
+       video_format.second_field_start = 1;
 
        if (video_frame) {
                video_format.has_signal = !(video_frame->GetFlags() & bmdFrameHasNoInputSource);
@@ -473,6 +452,8 @@ void DeckLinkCapture::set_video_mode_no_restart(uint32_t video_mode_id)
                exit(1);
        }
 
+       field_dominance = display_mode->GetFieldDominance();
+
        if (running) {
                if (input->EnableVideoInput(video_mode_id, bmdFormat8BitYUV, 0) != S_OK) {
                        fprintf(stderr, "Failed to set video mode 0x%04x for card %d\n", video_mode_id, card_index);