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)
{
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);
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();
#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);
}
}
}
}
char buf[256];
- snprintf(buf, sizeof(buf), "Card %d: Bus %03u Device %03u %s",
+ snprintf(buf, sizeof(buf), "USB card %d: Bus %03u Device %03u %s",
int(i), found_cards[i].bus, found_cards[i].port, product_name);
if (i == size_t(card_index)) {
*description = buf;
void BMUSBCapture::configure_card()
{
if (video_frame_allocator == nullptr) {
- set_video_frame_allocator(new MallocFrameAllocator(FRAME_SIZE, NUM_QUEUED_VIDEO_FRAMES)); // FIXME: leak.
+ owned_video_frame_allocator.reset(new MallocFrameAllocator(FRAME_SIZE, NUM_QUEUED_VIDEO_FRAMES));
+ set_video_frame_allocator(owned_video_frame_allocator.get());
}
if (audio_frame_allocator == nullptr) {
- set_audio_frame_allocator(new MallocFrameAllocator(65536, NUM_QUEUED_AUDIO_FRAMES)); // FIXME: leak.
+ owned_audio_frame_allocator.reset(new MallocFrameAllocator(65536, NUM_QUEUED_AUDIO_FRAMES));
+ set_audio_frame_allocator(owned_audio_frame_allocator.get());
}
dequeue_thread_should_quit = false;
dequeue_thread = thread(&BMUSBCapture::dequeue_thread_func, this);
exit(1);
}
- libusb_device_handle *devh = open_card(card_index, &description);
+ devh = open_card(card_index, &description);
if (!devh) {
fprintf(stderr, "Error finding USB device\n");
exit(1);
// 0x20 - 720p??
// 0x30 - 576p??
+ update_capture_mode();
+
struct ctrl {
int endpoint;
int request;
{ LIBUSB_ENDPOINT_IN, 214, 16, 0 },
{ LIBUSB_ENDPOINT_IN, 214, 0, 0 },
- // seems to capture on HDMI, clearing the 0x20000000 bit seems to activate 10-bit
- // capture (v210).
- // clearing the 0x08000000 bit seems to change the capture format (other source?)
- // 0x10000000 = analog audio instead of embedded audio, it seems
- // 0x3a000000 = component video? (analog audio)
- // 0x3c000000 = composite video? (analog audio)
- // 0x3e000000 = s-video? (analog audio)
- { LIBUSB_ENDPOINT_OUT, 215, 0, 0x29000000 },
//{ LIBUSB_ENDPOINT_OUT, 215, 0, 0x80000100 },
//{ LIBUSB_ENDPOINT_OUT, 215, 0, 0x09000000 },
{ LIBUSB_ENDPOINT_OUT, 215, 24, 0x73c60001 }, // latch for frame start?
xfr->user_data = this;
//libusb_submit_transfer(xfr);
- audiofp = fopen("audio.raw", "wb");
+ //audiofp = fopen("audio.raw", "wb");
// set up isochronous transfers for audio and video
for (int e = 3; e <= 4; ++e) {
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().
+}
+
+std::map<uint32_t, std::string> BMUSBCapture::get_available_video_inputs() const
+{
+ return {
+ { 0x00000000, "HDMI/SDI" },
+ { 0x02000000, "Component" },
+ { 0x04000000, "Composite" },
+ { 0x06000000, "S-video" }
+ };
+}
+
+void BMUSBCapture::set_video_input(uint32_t video_input_id)
+{
+ assert((video_input_id & ~0x06000000) == 0);
+ current_video_input = video_input_id;
+ update_capture_mode();
+}
+
+std::map<uint32_t, std::string> BMUSBCapture::get_available_audio_inputs() const
+{
+ return {
+ { 0x00000000, "Embedded" },
+ { 0x10000000, "Analog" }
+ };
+}
+
+void BMUSBCapture::set_audio_input(uint32_t audio_input_id)
+{
+ assert((audio_input_id & ~0x10000000) == 0);
+ current_audio_input = audio_input_id;
+ update_capture_mode();
+}
+
+void BMUSBCapture::update_capture_mode()
+{
+ // clearing the 0x20000000 bit seems to activate 10-bit capture (v210).
+ // clearing the 0x08000000 bit seems to change the capture format (other source?)
+ uint32_t mode = htonl(0x29000000 | current_video_input | current_audio_input);
+
+ int rc = libusb_control_transfer(devh, LIBUSB_REQUEST_TYPE_VENDOR | LIBUSB_ENDPOINT_OUT,
+ /*request=*/215, /*value=*/0, /*index=*/0, (unsigned char *)&mode, sizeof(mode), /*timeout=*/0);
+ if (rc < 0) {
+ fprintf(stderr, "Error on setting mode: %s\n", libusb_error_name(rc));
+ exit(1);
+ }
+}
projects / bmusb / blobdiff