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

diff --git a/nageru/decklink_output.cpp b/nageru/decklink_output.cpp
index f1e06e8..00d8043 100644
--- a/nageru/decklink_output.cpp
+++ b/nageru/decklink_output.cpp
@@ -154,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();
 	}
@@ -439,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;
@@ -564,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());