X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=nageru%2Fdecklink_output.cpp;h=00d80432564c569f437a0817e3dafc22a9a3c37d;hb=3941206233723cb45596b1ca54f00ab82e080268;hp=c9cd481c4d49e411dcdeb69028408bb3d20bcc18;hpb=f7752bad9a473d26ff1fa7c83ac82dca098b63bb;p=nageru

diff --git a/nageru/decklink_output.cpp b/nageru/decklink_output.cpp
index c9cd481..00d8043 100644
--- a/nageru/decklink_output.cpp
+++ b/nageru/decklink_output.cpp
@@ -84,6 +84,9 @@ DeckLinkOutput::DeckLinkOutput(ResourcePool *resource_pool, QSurface *surface, u
 
 bool DeckLinkOutput::set_device(IDeckLink *decklink)
 {
+	if (decklink->QueryInterface(IID_IDeckLinkInput, (void**)&input) != S_OK) {
+		input = nullptr;
+	}
 	if (decklink->QueryInterface(IID_IDeckLinkOutput, (void**)&output) != S_OK) {
 		fprintf(stderr, "Warning: Card %u has no outputs\n", card_index);
 		return false;
@@ -151,7 +154,7 @@ void DeckLinkOutput::start_output(uint32_t mode, int64_t base_pts)
 		fprintf(stderr, "Failed to set video output connection for card %u\n", card_index);
 		abort();
 	}
-	if (config->SetFlag(bmdDeckLinkConfigUse1080pNotPsF, true) != S_OK) {
+	if (config->SetFlag(bmdDeckLinkConfigOutput1080pAsPsF, true) != S_OK) {
 		fprintf(stderr, "Failed to set PsF flag for card\n");
 		abort();
 	}
@@ -193,6 +196,15 @@ void DeckLinkOutput::start_output(uint32_t mode, int64_t base_pts)
 
 	display_mode->Release();
 
+	if (input != nullptr) {
+		if (input->DisableVideoInput() != S_OK) {
+			fprintf(stderr, "Warning: Failed to disable video input for card %d\n", card_index);
+		}
+		if (input->DisableAudioInput() != S_OK) {
+			fprintf(stderr, "Warning: Failed to disable audio input for card %d\n", card_index);
+		}
+	}
+
 	HRESULT result = output->EnableVideoOutput(mode, bmdVideoOutputFlagDefault);
 	if (result != S_OK) {
 		fprintf(stderr, "Couldn't enable output with error 0x%x\n", result);
@@ -248,6 +260,15 @@ void DeckLinkOutput::end_output()
 			frame_freelist.pop();
 		}
 	}
+
+	if (input != nullptr) {
+		input->Release();
+		input = nullptr;
+	}
+	if (output != nullptr) {
+		output->Release();
+		output = nullptr;
+	}
 }
 
 void DeckLinkOutput::send_frame(GLuint y_tex, GLuint cbcr_tex, YCbCrLumaCoefficients output_ycbcr_coefficients, const vector<RefCountedFrame> &input_frames, int64_t pts, int64_t duration)
@@ -418,7 +439,7 @@ uint32_t DeckLinkOutput::pick_video_mode(uint32_t mode) const
 	}
 
 	// Prioritize 59.94 > 60 > 29.97. If none of those are found, then pick the highest one.
-	for (const pair<int, int> &desired : vector<pair<int, int>>{ { 60000, 1001 }, { 60, 0 }, { 30000, 1001 } }) {
+	for (const pair<int, int> &desired : vector<pair<int, int>>{ { 60000, 1001 }, { 60, 1 }, { 30000, 1001 } }) {
 		for (const auto &it : video_modes) {
 			if (it.second.frame_rate_num * desired.second == desired.first * it.second.frame_rate_den) {
 				return it.first;
@@ -543,11 +564,11 @@ void DeckLinkOutput::present_thread_func()
 	for ( ;; ) {
 		unique_ptr<Frame> frame;
 		{
-                        unique_lock<mutex> lock(frame_queue_mutex);
-                        frame_queues_changed.wait(lock, [this]{
-                                return should_quit.should_quit() || !pending_video_frames.empty();
-                        });
-                        if (should_quit.should_quit()) {
+			unique_lock<mutex> lock(frame_queue_mutex);
+			frame_queues_changed.wait(lock, [this]{
+				return should_quit.should_quit() || !pending_video_frames.empty();
+			});
+			if (should_quit.should_quit()) {
 				return;
 			}
 			frame = move(pending_video_frames.front());