X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=decklink_capture.cpp;h=4db60120f3040a0325325959c7edd5a0463cc5a8;hb=96cb6414f85e0ef4d660b7bd56267303e80fcd05;hp=eee46c4454f528db07fd2593129b25949c3cd19d;hpb=14c360d834d666ab543bffaf99b6cdfb8c2babac;p=nageru

diff --git a/decklink_capture.cpp b/decklink_capture.cpp
index eee46c4..4db6012 100644
--- a/decklink_capture.cpp
+++ b/decklink_capture.cpp
@@ -20,6 +20,8 @@
 
 #include "bmusb/bmusb.h"
 #include "decklink_util.h"
+#include "flags.h"
+#include "v210_converter.h"
 
 #define FRAME_SIZE (8 << 20)  // 8 MB.
 
@@ -138,6 +140,18 @@ size_t memcpy_interleaved_fastpath(uint8_t *dest1, uint8_t *dest2, const uint8_t
 
 #endif  // __SSE2__
 
+BMDPixelFormat pixel_format_to_bmd(PixelFormat pixel_format)
+{
+	switch (pixel_format) {
+	case PixelFormat_8BitYCbCr:
+		return bmdFormat8BitYUV;
+	case PixelFormat_10BitYCbCr:
+		return bmdFormat10BitYUV;
+	default:
+		assert(false);
+	}
+}
+
 }  // namespace
 
 DeckLinkCapture::DeckLinkCapture(IDeckLink *card, int card_index)
@@ -326,38 +340,49 @@ HRESULT STDMETHODCALLTYPE DeckLinkCapture::VideoInputFrameArrived(
 	if (video_frame) {
 		video_format.has_signal = !(video_frame->GetFlags() & bmdFrameHasNoInputSource);
 
-		int width = video_frame->GetWidth();
-		int height = video_frame->GetHeight();
+		const int width = video_frame->GetWidth();
+		const int height = video_frame->GetHeight();
 		const int stride = video_frame->GetRowBytes();
-		assert(stride == width * 2);
+		const BMDPixelFormat format = video_frame->GetPixelFormat();
+		assert(format == pixel_format_to_bmd(current_pixel_format));
+		if (global_flags.ten_bit_input) {
+			assert(stride == int(v210Converter::get_v210_stride(width)));
+		} else {
+			assert(stride == width * 2);
+		}
 
 		current_video_frame = video_frame_allocator->alloc_frame();
 		if (current_video_frame.data != nullptr) {
 			const uint8_t *frame_bytes;
 			video_frame->GetBytes((void **)&frame_bytes);
+			size_t num_bytes = stride * height;
 
-			uint8_t *data = current_video_frame.data;
-			uint8_t *data2 = current_video_frame.data2;
-			size_t num_bytes = width * height * 2;
+			if (current_video_frame.interleaved) {
+				uint8_t *data = current_video_frame.data;
+				uint8_t *data2 = current_video_frame.data2;
 #ifdef __SSE2__
-			size_t consumed = memcpy_interleaved_fastpath(data, data2, frame_bytes, num_bytes);
-			frame_bytes += consumed;
-			data += consumed / 2;
-			data2 += consumed / 2;
-			if (num_bytes % 2) {
-				swap(data, data2);
-			}
-			current_video_frame.len += consumed;
-			num_bytes -= consumed;
+				size_t consumed = memcpy_interleaved_fastpath(data, data2, frame_bytes, num_bytes);
+				frame_bytes += consumed;
+				data += consumed / 2;
+				data2 += consumed / 2;
+				if (num_bytes % 2) {
+					swap(data, data2);
+				}
+				current_video_frame.len += consumed;
+				num_bytes -= consumed;
 #endif
 
-			if (num_bytes > 0) {
-				memcpy_interleaved(data, data2, frame_bytes, num_bytes);
+				if (num_bytes > 0) {
+					memcpy_interleaved(data, data2, frame_bytes, num_bytes);
+				}
+			} else {
+				memcpy(current_video_frame.data, frame_bytes, num_bytes);
 			}
 			current_video_frame.len += num_bytes;
 
 			video_format.width = width;
 			video_format.height = height;
+			video_format.stride = stride;
 		}
 	}
 
@@ -409,7 +434,7 @@ void DeckLinkCapture::start_bm_capture()
 	if (running) {
 		return;
 	}
-	if (input->EnableVideoInput(current_video_mode, bmdFormat8BitYUV, supports_autodetect ? bmdVideoInputEnableFormatDetection : 0) != S_OK) {
+	if (input->EnableVideoInput(current_video_mode, pixel_format_to_bmd(current_pixel_format), supports_autodetect ? bmdVideoInputEnableFormatDetection : 0) != S_OK) {
 		fprintf(stderr, "Failed to set video mode 0x%04x for card %d\n", current_video_mode, card_index);
 		exit(1);
 	}
@@ -448,28 +473,38 @@ void DeckLinkCapture::stop_dequeue_thread()
 
 void DeckLinkCapture::set_video_mode(uint32_t video_mode_id)
 {
-	if (input->PauseStreams() != S_OK) {
-		fprintf(stderr, "PauseStreams failed\n");
-		exit(1);
-	}
-	if (input->FlushStreams() != S_OK) {
-		fprintf(stderr, "FlushStreams failed\n");
-		exit(1);
+	if (running) {
+		if (input->PauseStreams() != S_OK) {
+			fprintf(stderr, "PauseStreams failed\n");
+			exit(1);
+		}
+		if (input->FlushStreams() != S_OK) {
+			fprintf(stderr, "FlushStreams failed\n");
+			exit(1);
+		}
 	}
 
 	set_video_mode_no_restart(video_mode_id);
 
-	if (input->StartStreams() != S_OK) {
-		fprintf(stderr, "StartStreams failed\n");
-		exit(1);
+	if (running) {
+		if (input->StartStreams() != S_OK) {
+			fprintf(stderr, "StartStreams failed\n");
+			exit(1);
+		}
 	}
 }
 
+void DeckLinkCapture::set_pixel_format(PixelFormat pixel_format)
+{
+	current_pixel_format = pixel_format;
+	set_video_mode(current_video_mode);
+}
+
 void DeckLinkCapture::set_video_mode_no_restart(uint32_t video_mode_id)
 {
 	BMDDisplayModeSupport support;
 	IDeckLinkDisplayMode *display_mode;
-	if (input->DoesSupportVideoMode(video_mode_id, bmdFormat8BitYUV, /*flags=*/0, &support, &display_mode)) {
+	if (input->DoesSupportVideoMode(video_mode_id, pixel_format_to_bmd(current_pixel_format), /*flags=*/0, &support, &display_mode)) {
 		fprintf(stderr, "Failed to query display mode for card %d\n", card_index);
 		exit(1);
 	}
@@ -487,7 +522,7 @@ void DeckLinkCapture::set_video_mode_no_restart(uint32_t video_mode_id)
 	field_dominance = display_mode->GetFieldDominance();
 
 	if (running) {
-		if (input->EnableVideoInput(video_mode_id, bmdFormat8BitYUV, supports_autodetect ? bmdVideoInputEnableFormatDetection : 0) != S_OK) {
+		if (input->EnableVideoInput(video_mode_id, pixel_format_to_bmd(current_pixel_format), supports_autodetect ? bmdVideoInputEnableFormatDetection : 0) != S_OK) {
 			fprintf(stderr, "Failed to set video mode 0x%04x for card %d\n", video_mode_id, card_index);
 			exit(1);
 		}