X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=bmusb.cpp;h=3d2c9f018488e202dff12e9439ebe8be665fa376;hb=5b54cc5acb28f5d2071c99ef7a715044aa30f10c;hp=74643bc9b03879194a7663d9489528295e534396;hpb=bb575c1ac8b1496394732800898c27a3a812f0a9;p=bmusb

diff --git a/bmusb.cpp b/bmusb.cpp
index 74643bc..3d2c9f0 100644
--- a/bmusb.cpp
+++ b/bmusb.cpp
@@ -80,26 +80,6 @@ void change_xfer_size_for_width(int width, libusb_transfer *xfr)
 
 FrameAllocator::~FrameAllocator() {}
 
-// Audio is more important than video, and also much cheaper.
-// By having many more audio frames available, hopefully if something
-// starts to drop, we'll have CPU load go down (from not having to
-// process as much video) before we have to drop audio.
-#define NUM_QUEUED_VIDEO_FRAMES 16
-#define NUM_QUEUED_AUDIO_FRAMES 64
-
-class MallocFrameAllocator : public FrameAllocator {
-public:
-	MallocFrameAllocator(size_t frame_size, size_t num_queued_frames);
-	Frame alloc_frame() override;
-	void release_frame(Frame frame) override;
-
-private:
-	size_t frame_size;
-
-	mutex freelist_mutex;
-	stack<unique_ptr<uint8_t[]>> freelist;  // All of size <frame_size>.
-};
-
 MallocFrameAllocator::MallocFrameAllocator(size_t frame_size, size_t num_queued_frames)
 	: frame_size(frame_size)
 {
@@ -191,6 +171,9 @@ void BMUSBCapture::dequeue_thread_func()
 
 		uint16_t video_timecode = pending_video_frames.front().timecode;
 		uint16_t audio_timecode = pending_audio_frames.front().timecode;
+		AudioFormat audio_format;
+		audio_format.bits_per_sample = 24;
+		audio_format.num_channels = 8;
 		if (uint16_less_than_with_wraparound(video_timecode, audio_timecode)) {
 			printf("Video block 0x%04x without corresponding audio block, dropping.\n",
 				video_timecode);
@@ -204,9 +187,16 @@ void BMUSBCapture::dequeue_thread_func()
 			QueuedFrame audio_frame = pending_audio_frames.front();
 			pending_audio_frames.pop_front();
 			lock.unlock();
+			audio_format.id = audio_frame.format;
+
+			// Use the video format of the pending frame.
+			QueuedFrame video_frame = pending_video_frames.front();
+			VideoFormat video_format;
+			decode_video_format(video_frame.format, &video_format);
+
 			frame_callback(audio_timecode,
-			               FrameAllocator::Frame(), 0, VideoFormat(),
-			               audio_frame.frame, AUDIO_HEADER_SIZE, audio_frame.format);
+			               FrameAllocator::Frame(), 0, video_format,
+			               audio_frame.frame, AUDIO_HEADER_SIZE, audio_format);
 		} else {
 			QueuedFrame video_frame = pending_video_frames.front();
 			QueuedFrame audio_frame = pending_audio_frames.front();
@@ -222,14 +212,15 @@ void BMUSBCapture::dequeue_thread_func()
 #endif
 
 			VideoFormat video_format;
+			audio_format.id = audio_frame.format;
 			if (decode_video_format(video_frame.format, &video_format)) {
 				frame_callback(video_timecode,
 					       video_frame.frame, HEADER_SIZE, video_format,
-					       audio_frame.frame, AUDIO_HEADER_SIZE, audio_frame.format);
+					       audio_frame.frame, AUDIO_HEADER_SIZE, audio_format);
 			} else {
 				frame_callback(video_timecode,
 				               FrameAllocator::Frame(), 0, video_format,
-					       audio_frame.frame, AUDIO_HEADER_SIZE, audio_frame.format);
+					       audio_frame.frame, AUDIO_HEADER_SIZE, audio_format);
 			}
 		}
 	}
@@ -1150,6 +1141,7 @@ bool decode_video_format(uint16_t video_format, VideoFormat *decoded_video_forma
 		decoded_video_format->extra_lines_bottom = 0;
 		decoded_video_format->frame_rate_nom = 3013;
 		decoded_video_format->frame_rate_den = 100;
+		decoded_video_format->has_signal = false;
 		return true;
 	}
 	if ((video_format & 0xe800) != 0xe800) {
@@ -1161,9 +1153,12 @@ bool decode_video_format(uint16_t video_format, VideoFormat *decoded_video_forma
 		decoded_video_format->extra_lines_bottom = 0;
 		decoded_video_format->frame_rate_nom = 60;
 		decoded_video_format->frame_rate_den = 1;
+		decoded_video_format->has_signal = false;
 		return false;
 	}
 
+	decoded_video_format->has_signal = true;
+
 	// NTSC (480i59.94, I suppose). A special case, see below.
 	if (video_format == 0xe901 || video_format == 0xe9c1 || video_format == 0xe801) {
 		decoded_video_format->width = 720;
@@ -1235,3 +1230,22 @@ bool decode_video_format(uint16_t video_format, VideoFormat *decoded_video_forma
 	decoded_video_format->frame_rate_den = 1;
 	return false;
 }
+
+map<uint32_t, VideoMode> BMUSBCapture::get_available_video_modes() const
+{
+	// The USB3 cards autodetect, and seem to have no provision for forcing modes.
+	VideoMode auto_mode;
+	auto_mode.name = "Autodetect";
+	auto_mode.autodetect = true;
+	return {{ 0, auto_mode }};
+}
+
+uint32_t BMUSBCapture::get_current_video_mode() const
+{
+	return 0;  // Matches get_available_video_modes().
+}
+
+void BMUSBCapture::set_video_mode(uint32_t video_mode_id)
+{
+	assert(video_mode_id == 0);  // Matches get_available_video_modes().
+}