Release Nageru 1.2.1.

[nageru] / decklink_capture.cpp

diff --git a/decklink_capture.cpp b/decklink_capture.cpp
index f2731acae422c9dbe9d259b77917ebe679a30621..e45f95988a32a7d8a7a2703426a32e39b2a39a09 100644 (file)
--- a/decklink_capture.cpp
+++ b/decklink_capture.cpp
@@ -140,9 +140,9 @@ DeckLinkCapture::DeckLinkCapture(IDeckLink *card, int card_index)
                const char *model_name;
                char buf[256];
                if (card->GetModelName(&model_name) == S_OK) {
-                       snprintf(buf, sizeof(buf), "Card %d: %s", card_index, model_name);
+                       snprintf(buf, sizeof(buf), "PCI card %d: %s", card_index, model_name);
                } else {
-                       snprintf(buf, sizeof(buf), "Card %d: Unknown DeckLink card", card_index);
+                       snprintf(buf, sizeof(buf), "PCI card %d: Unknown DeckLink card", card_index);
                }
                description = buf;
        }
@@ -152,23 +152,64 @@ DeckLinkCapture::DeckLinkCapture(IDeckLink *card, int card_index)
                exit(1);
        }
 
-       /* Set up the video and audio sources. */
-       IDeckLinkConfiguration *config;
-       if (card->QueryInterface(IID_IDeckLinkConfiguration, (void**)&config) != S_OK) {
-               fprintf(stderr, "Failed to get configuration interface for card %d\n", card_index);
+       IDeckLinkAttributes *attr;
+       if (card->QueryInterface(IID_IDeckLinkAttributes, (void**)&attr) != S_OK) {
+               fprintf(stderr, "Card %d has no attributes\n", card_index);
                exit(1);
        }
 
-       if (config->SetInt(bmdDeckLinkConfigVideoInputConnection, bmdVideoConnectionHDMI) != S_OK) {
-               fprintf(stderr, "Failed to set video input connection for card %d\n", card_index);
+       // Get the list of available video inputs.
+       int64_t video_input_mask;
+       if (attr->GetInt(BMDDeckLinkVideoInputConnections, &video_input_mask) != S_OK) {
+               fprintf(stderr, "Failed to enumerate video inputs for card %d\n", card_index);
                exit(1);
        }
+       const vector<pair<BMDVideoConnection, string>> video_input_types = {
+               { bmdVideoConnectionSDI, "SDI" },
+               { bmdVideoConnectionHDMI, "HDMI" },
+               { bmdVideoConnectionOpticalSDI, "Optical SDI" },
+               { bmdVideoConnectionComponent, "Component" },
+               { bmdVideoConnectionComposite, "Composite" },
+               { bmdVideoConnectionSVideo, "S-Video" }
+       };
+       for (const auto &video_input : video_input_types) {
+               if (video_input_mask & video_input.first) {
+                       video_inputs.emplace(video_input.first, video_input.second);
+               }
+       }
 
-       if (config->SetInt(bmdDeckLinkConfigAudioInputConnection, bmdAudioConnectionEmbedded) != S_OK) {
-               fprintf(stderr, "Failed to set video input connection for card %d\n", card_index);
+       // And then the available audio inputs.
+       int64_t audio_input_mask;
+       if (attr->GetInt(BMDDeckLinkAudioInputConnections, &audio_input_mask) != S_OK) {
+               fprintf(stderr, "Failed to enumerate audio inputs for card %d\n", card_index);
+               exit(1);
+       }
+       const vector<pair<BMDAudioConnection, string>> audio_input_types = {
+               { bmdAudioConnectionEmbedded, "Embedded" },
+               { bmdAudioConnectionAESEBU, "AES/EBU" },
+               { bmdAudioConnectionAnalog, "Analog" },
+               { bmdAudioConnectionAnalogXLR, "Analog XLR" },
+               { bmdAudioConnectionAnalogRCA, "Analog RCA" },
+               { bmdAudioConnectionMicrophone, "Microphone" },
+               { bmdAudioConnectionHeadphones, "Headphones" }
+       };
+       for (const auto &audio_input : audio_input_types) {
+               if (audio_input_mask & audio_input.first) {
+                       audio_inputs.emplace(audio_input.first, audio_input.second);
+               }
+       }
+
+       attr->Release();
+
+       /* Set up the video and audio sources. */
+       if (card->QueryInterface(IID_IDeckLinkConfiguration, (void**)&config) != S_OK) {
+               fprintf(stderr, "Failed to get configuration interface for card %d\n", card_index);
                exit(1);
        }
 
+       set_video_input(bmdVideoConnectionHDMI);
+       set_audio_input(bmdAudioConnectionEmbedded);
+
        IDeckLinkDisplayModeIterator *mode_it;
        if (input->GetDisplayModeIterator(&mode_it) != S_OK) {
                fprintf(stderr, "Failed to enumerate display modes for card %d\n", card_index);
@@ -206,8 +247,7 @@ DeckLinkCapture::DeckLinkCapture(IDeckLink *card, int card_index)
                video_modes.insert(make_pair(id, mode));
        }
 
-       // TODO: Make the user mode selectable.
-       set_video_mode(bmdModeHD720p5994);
+       set_video_mode_no_restart(bmdModeHD720p5994);
 
        if (input->EnableAudioInput(48000, bmdAudioSampleType32bitInteger, 2) != S_OK) {
                fprintf(stderr, "Failed to enable audio input for card %d\n", card_index);
@@ -365,6 +405,21 @@ void DeckLinkCapture::stop_dequeue_thread()
 }
 
 void DeckLinkCapture::set_video_mode(uint32_t video_mode_id)
+{
+       if (input->StopStreams() != S_OK) {
+               fprintf(stderr, "StopStreams failed\n");
+               exit(1);
+       }
+
+       set_video_mode_no_restart(video_mode_id);
+
+       if (input->StartStreams() != S_OK) {
+               fprintf(stderr, "StartStreams failed\n");
+               exit(1);
+       }
+}
+
+void DeckLinkCapture::set_video_mode_no_restart(uint32_t video_mode_id)
 {
        BMDDisplayModeSupport support;
        IDeckLinkDisplayMode *display_mode;
@@ -384,9 +439,29 @@ void DeckLinkCapture::set_video_mode(uint32_t video_mode_id)
        }
 
        if (input->EnableVideoInput(video_mode_id, bmdFormat8BitYUV, 0) != S_OK) {
-               fprintf(stderr, "Failed to set 720p59.94 connection for card %d\n", card_index);
+               fprintf(stderr, "Failed to set video mode 0x%04x for card %d\n", video_mode_id, card_index);
                exit(1);
        }
 
        current_video_mode = video_mode_id;
 }
+
+void DeckLinkCapture::set_video_input(uint32_t video_input_id)
+{
+       if (config->SetInt(bmdDeckLinkConfigVideoInputConnection, video_input_id) != S_OK) {
+               fprintf(stderr, "Failed to set video input connection for card %d\n", card_index);
+               exit(1);
+       }
+
+       current_video_input = video_input_id;
+}
+
+void DeckLinkCapture::set_audio_input(uint32_t audio_input_id)
+{
+       if (config->SetInt(bmdDeckLinkConfigAudioInputConnection, audio_input_id) != S_OK) {
+               fprintf(stderr, "Failed to set audio input connection for card %d\n", card_index);
+               exit(1);
+       }
+
+       current_audio_input = audio_input_id;
+}