uint32_t s2 = *src++;
uint32_t s3 = *src++;
uint32_t s = s1 | (s1 << 8) | (s2 << 16) | (s3 << 24);
- dst[i * out_channels + j] = int(s) * (1.0f / 4294967296.0f);
+ dst[i * out_channels + j] = int(s) * (1.0f / 2147483648.0f);
}
src += 3 * (in_channels - out_channels);
}
for (size_t j = 0; j < out_channels; ++j) {
// Note: Assumes little-endian.
int32_t s = *(int32_t *)src;
- dst[i * out_channels + j] = s * (1.0f / 4294967296.0f);
+ dst[i * out_channels + j] = s * (1.0f / 2147483648.0f);
src += 4;
}
src += 4 * (in_channels - out_channels);
movit_texel_subpixel_precision /= 2.0;
resource_pool.reset(new ResourcePool);
- theme.reset(new Theme(global_flags.theme_filename.c_str(), resource_pool.get(), num_cards));
+ theme.reset(new Theme(global_flags.theme_filename, global_flags.theme_dirs, resource_pool.get(), num_cards));
for (unsigned i = 0; i < NUM_OUTPUTS; ++i) {
output_channel[i].parent = this;
output_channel[i].channel = i;
// Start listening for clients only once VideoEncoder has written its header, if any.
httpd.start(9095);
- // First try initializing the fake devices, then PCI devices, then USB,
- // until we have the desired number of cards.
- unsigned num_pci_devices = 0, num_usb_devices = 0;
+ // First try initializing the then PCI devices, then USB, then
+ // fill up with fake cards until we have the desired number of cards.
+ unsigned num_pci_devices = 0;
unsigned card_index = 0;
- assert(global_flags.num_fake_cards >= 0); // Enforced in flags.cpp.
- unsigned num_fake_cards = global_flags.num_fake_cards;
-
- assert(num_fake_cards <= num_cards); // Enforced in flags.cpp.
- for ( ; card_index < num_fake_cards; ++card_index) {
- configure_card(card_index, new FakeCapture(WIDTH, HEIGHT, FAKE_FPS, OUTPUT_FREQUENCY, card_index), /*is_fake_capture=*/true);
- }
-
- if (global_flags.num_fake_cards > 0) {
- fprintf(stderr, "Initialized %d fake cards.\n", global_flags.num_fake_cards);
- }
-
- if (card_index < num_cards) {
+ {
IDeckLinkIterator *decklink_iterator = CreateDeckLinkIteratorInstance();
if (decklink_iterator != nullptr) {
for ( ; card_index < num_cards; ++card_index) {
break;
}
- configure_card(card_index, new DeckLinkCapture(decklink, card_index - num_fake_cards), /*is_fake_capture=*/false);
+ configure_card(card_index, new DeckLinkCapture(decklink, card_index), /*is_fake_capture=*/false);
++num_pci_devices;
}
decklink_iterator->Release();
- fprintf(stderr, "Found %d DeckLink PCI card(s).\n", num_pci_devices);
+ fprintf(stderr, "Found %u DeckLink PCI card(s).\n", num_pci_devices);
} else {
fprintf(stderr, "DeckLink drivers not found. Probing for USB cards only.\n");
}
}
- for ( ; card_index < num_cards; ++card_index) {
- BMUSBCapture *capture = new BMUSBCapture(card_index - num_pci_devices - num_fake_cards);
+ unsigned num_usb_devices = BMUSBCapture::num_cards();
+ for (unsigned usb_card_index = 0; usb_card_index < num_usb_devices && card_index < num_cards; ++usb_card_index, ++card_index) {
+ BMUSBCapture *capture = new BMUSBCapture(usb_card_index);
capture->set_card_disconnected_callback(bind(&Mixer::bm_hotplug_remove, this, card_index));
configure_card(card_index, capture, /*is_fake_capture=*/false);
- ++num_usb_devices;
+ }
+ fprintf(stderr, "Found %u USB card(s).\n", num_usb_devices);
+
+ unsigned num_fake_cards = 0;
+ for ( ; card_index < num_cards; ++card_index, ++num_fake_cards) {
+ FakeCapture *capture = new FakeCapture(WIDTH, HEIGHT, FAKE_FPS, OUTPUT_FREQUENCY, card_index, global_flags.fake_cards_audio);
+ configure_card(card_index, capture, /*is_fake_capture=*/true);
}
- if (num_usb_devices > 0) {
- has_bmusb_thread = true;
- BMUSBCapture::set_card_connected_callback(bind(&Mixer::bm_hotplug_add, this, _1));
- BMUSBCapture::start_bm_thread();
+ if (num_fake_cards > 0) {
+ fprintf(stderr, "Initialized %u fake cards.\n", num_fake_cards);
}
+ BMUSBCapture::set_card_connected_callback(bind(&Mixer::bm_hotplug_add, this, _1));
+ BMUSBCapture::start_bm_thread();
+
for (card_index = 0; card_index < num_cards; ++card_index) {
cards[card_index].queue_length_policy.reset(card_index);
cards[card_index].capture->start_bm_capture();
{
resource_pool->release_glsl_program(cbcr_program_num);
glDeleteBuffers(1, &cbcr_vbo);
- if (has_bmusb_thread) {
- BMUSBCapture::stop_bm_thread();
- }
+ BMUSBCapture::stop_bm_thread();
for (unsigned card_index = 0; card_index < num_cards; ++card_index) {
{
CaptureCard *card = &cards[card_index];
if (card->capture->get_disconnected()) {
fprintf(stderr, "Card %u went away, replacing with a fake card.\n", card_index);
- configure_card(card_index, new FakeCapture(WIDTH, HEIGHT, FAKE_FPS, OUTPUT_FREQUENCY, card_index), /*is_fake_capture=*/true);
+ FakeCapture *capture = new FakeCapture(WIDTH, HEIGHT, FAKE_FPS, OUTPUT_FREQUENCY, card_index, global_flags.fake_cards_audio);
+ configure_card(card_index, capture, /*is_fake_capture=*/true);
card->queue_length_policy.reset(card_index);
card->capture->start_bm_capture();
}
// printf("limiter=%+5.1f compressor=%+5.1f\n", 20.0*log10(limiter_att), 20.0*log10(compressor_att));
- // Upsample 4x to find interpolated peak.
- peak_resampler.inp_data = samples_out.data();
- peak_resampler.inp_count = samples_out.size() / 2;
-
- vector<float> interpolated_samples_out;
- interpolated_samples_out.resize(samples_out.size());
- while (peak_resampler.inp_count > 0) { // About four iterations.
- peak_resampler.out_data = &interpolated_samples_out[0];
- peak_resampler.out_count = interpolated_samples_out.size() / 2;
- peak_resampler.process();
- size_t out_stereo_samples = interpolated_samples_out.size() / 2 - peak_resampler.out_count;
- peak = max<float>(peak, find_peak(interpolated_samples_out.data(), out_stereo_samples * 2));
- peak_resampler.out_data = nullptr;
- }
-
// At this point, we are most likely close to +0 LU, but all of our
// measurements have been on raw sample values, not R128 values.
// So we have a final makeup gain to get us to +0 LU; the gain
final_makeup_gain = m;
}
+ // Upsample 4x to find interpolated peak.
+ peak_resampler.inp_data = samples_out.data();
+ peak_resampler.inp_count = samples_out.size() / 2;
+
+ vector<float> interpolated_samples_out;
+ interpolated_samples_out.resize(samples_out.size());
+ while (peak_resampler.inp_count > 0) { // About four iterations.
+ peak_resampler.out_data = &interpolated_samples_out[0];
+ peak_resampler.out_count = interpolated_samples_out.size() / 2;
+ peak_resampler.process();
+ size_t out_stereo_samples = interpolated_samples_out.size() / 2 - peak_resampler.out_count;
+ peak = max<float>(peak, find_peak(interpolated_samples_out.data(), out_stereo_samples * 2));
+ peak_resampler.out_data = nullptr;
+ }
+
// Find R128 levels and L/R correlation.
vector<float> left, right;
deinterleave_samples(samples_out, &left, &right);
projects / nageru / blobdiff