X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=bmusb.cpp;h=de895d9240a858243f532c6a52ae03d59649b3d4;hb=9053593313b47bd5fd6b888bec9809bf4aacc8a9;hp=080c0bb0dae65f649ee34e5ba26ab023092a5fbf;hpb=fad914ea7890709cc03418f4ce6f4c784cbd193d;p=bmusb

diff --git a/bmusb.cpp b/bmusb.cpp
index 080c0bb..de895d9 100644
--- a/bmusb.cpp
+++ b/bmusb.cpp
@@ -1,4 +1,4 @@
-// Intensity Shuttle USB3 capture driver, v0.5.1
+// Intensity Shuttle USB3 capture driver, v0.5.4
 // Can download 8-bit and 10-bit UYVY/v210 frames from HDMI, quite stable
 // (can do captures for hours at a time with no drops), except during startup
 // 576p60/720p60/1080i60 works, 1080p60 does not work (firmware limitation)
@@ -25,6 +25,7 @@
 
 #include <algorithm>
 #include <atomic>
+#include <chrono>
 #include <condition_variable>
 #include <cstddef>
 #include <cstdint>
@@ -37,6 +38,7 @@
 #include <thread>
 
 using namespace std;
+using namespace std::chrono;
 using namespace std::placeholders;
 
 #define USB_VENDOR_BLACKMAGIC 0x1edb
@@ -172,14 +174,14 @@ bool decode_video_format(uint16_t video_format, VideoFormat *decoded_video_forma
 		{ 0x0103, 1280,  720,   0, 25,  5,    60,    1, false },  // 720p60.
 		{ 0x0125, 1280,  720,   0, 25,  5,    60,    1, false },  // 720p60.
 		{ 0x0121, 1280,  720,   0, 25,  5, 60000, 1001, false },  // 720p59.94.
-		{ 0x01c3, 1920, 1080,   0,  0,  0,    30,    1, false },  // 1080p30.
+		{ 0x01c3, 1920, 1080,   0, 20, 25,    30,    1, false },  // 1080p30.
 		{ 0x0003, 1920, 1080, 583, 20, 25,    30,    1,  true },  // 1080i60.
-		{ 0x01e1, 1920, 1080,   0,  0,  0, 30000, 1001, false },  // 1080p29.97.
+		{ 0x01e1, 1920, 1080,   0, 20, 25, 30000, 1001, false },  // 1080p29.97.
 		{ 0x0021, 1920, 1080, 583, 20, 25, 30000, 1001,  true },  // 1080i59.94.
-		{ 0x0063, 1920, 1080,   0,  0,  0,    25,    1, false },  // 1080p25.
-		{ 0x0043, 1920, 1080,   0,  0,  0,    25,    1,  true },  // 1080p50.
-		{ 0x008e, 1920, 1080,   0,  0,  0,    24,    1, false },  // 1080p24.
-		{ 0x00a1, 1920, 1080,   0,  0,  0, 24000, 1001, false },  // 1080p23.98.
+		{ 0x0063, 1920, 1080,   0, 20, 25,    25,    1, false },  // 1080p25.
+		{ 0x0043, 1920, 1080, 583, 20, 25,    25,    1,  true },  // 1080i50.
+		{ 0x0083, 1920, 1080,   0, 20, 25,    24,    1, false },  // 1080p24.
+		{ 0x00a1, 1920, 1080,   0, 20, 25, 24000, 1001, false },  // 1080p23.98.
 	};
 	for (const VideoFormatEntry &entry : entries) {
 		if (normalized_video_format == entry.normalized_video_format) {
@@ -362,6 +364,8 @@ void BMUSBCapture::start_new_frame(const uint8_t *start)
 	uint16_t timecode = (start[1] << 8) | start[0];
 
 	if (current_video_frame.len > 0) {
+		current_video_frame.received_timestamp = steady_clock::now();
+
 		// If format is 0x0800 (no signal), add a fake (empty) audio
 		// frame to get it out of the queue.
 		// TODO: Figure out if there are other formats that come with
@@ -405,6 +409,7 @@ void BMUSBCapture::start_new_audio_block(const uint8_t *start)
 	uint16_t format = (start[3] << 8) | start[2];
 	uint16_t timecode = (start[1] << 8) | start[0];
 	if (current_audio_frame.len > 0) {
+		current_audio_frame.received_timestamp = steady_clock::now();
 		//dump_audio_block();
 		queue_frame(format, timecode, current_audio_frame, &pending_audio_frames);
 	}
@@ -536,6 +541,10 @@ const uint8_t *add_to_frame_fastpath(FrameAllocator::Frame *current_frame, const
 
 #else  // defined(HAS_MULTIVERSIONING)
 
+__attribute__((target("sse4.1")))
+const uint8_t *add_to_frame_fastpath_core(FrameAllocator::Frame *current_frame, const uint8_t *aligned_start, const uint8_t *limit, const char sync_char);
+
+__attribute__((target("avx2")))
 const uint8_t *add_to_frame_fastpath_core(FrameAllocator::Frame *current_frame, const uint8_t *aligned_start, const uint8_t *limit, const char sync_char);
 
 // Does a memcpy and memchr in one to reduce processing time.