X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=mixer.cpp;h=b26e097e9e49bffc208dc890b047cdf1ea1f3978;hb=d41e4825e6e02a693661ae7b055b081411e8b1dc;hp=202617b9b718aae8b05ffb3872bafce980cc5b2a;hpb=fc8fb149109f0c12964d53b0dc2dc0f42ef1fc3a;p=nageru diff --git a/mixer.cpp b/mixer.cpp index 202617b..b26e097 100644 --- a/mixer.cpp +++ b/mixer.cpp @@ -304,8 +304,7 @@ Mixer::Mixer(const QSurfaceFormat &format, unsigned num_cards) num_cards(num_cards), mixer_surface(create_surface(format)), h264_encoder_surface(create_surface(format)), - decklink_output_surface(create_surface(format)), - audio_mixer(num_cards) + decklink_output_surface(create_surface(format)) { memcpy(ycbcr_interpretation, global_flags.ycbcr_interpretation, sizeof(ycbcr_interpretation)); CHECK(init_movit(MOVIT_SHADER_DIR, MOVIT_DEBUG_OFF)); @@ -361,6 +360,10 @@ Mixer::Mixer(const QSurfaceFormat &format, unsigned num_cards) // Must be instantiated after VideoEncoder has initialized global_flags.use_zerocopy. theme.reset(new Theme(global_flags.theme_filename, global_flags.theme_dirs, resource_pool.get(), num_cards)); + // Must be instantiated after the theme, as the theme decides the number of FFmpeg inputs. + std::vector video_inputs = theme->get_video_inputs(); + audio_mixer.reset(new AudioMixer(num_cards, video_inputs.size())); + httpd.add_endpoint("/channels", bind(&Mixer::get_channels_json, this), HTTPD::ALLOW_ALL_ORIGINS); for (int channel_idx = 2; channel_idx < theme->get_num_channels(); ++channel_idx) { char url[256]; @@ -421,7 +424,6 @@ Mixer::Mixer(const QSurfaceFormat &format, unsigned num_cards) // Initialize all video inputs the theme asked for. Note that these are // all put _after_ the regular cards, which stop at - 1. - std::vector video_inputs = theme->get_video_inputs(); for (unsigned video_card_index = 0; video_card_index < video_inputs.size(); ++card_index, ++video_card_index) { if (card_index >= MAX_VIDEO_CARDS) { fprintf(stderr, "ERROR: Not enough card slots available for the videos the theme requested.\n"); @@ -497,14 +499,10 @@ Mixer::Mixer(const QSurfaceFormat &format, unsigned num_cards) Mixer::~Mixer() { + httpd.stop(); BMUSBCapture::stop_bm_thread(); for (unsigned card_index = 0; card_index < num_cards + num_video_inputs + num_html_inputs; ++card_index) { - { - unique_lock lock(card_mutex); - cards[card_index].should_quit = true; // Unblock thread. - cards[card_index].new_frames_changed.notify_all(); - } cards[card_index].capture->stop_dequeue_thread(); if (cards[card_index].output) { cards[card_index].output->end_output(); @@ -558,10 +556,15 @@ void Mixer::configure_card(unsigned card_index, CaptureInterface *capture, CardT // NOTE: start_bm_capture() happens in thread_func(). - DeviceSpec device{InputSourceType::CAPTURE_CARD, card_index}; - audio_mixer.reset_resampler(device); - audio_mixer.set_display_name(device, card->capture->get_description()); - audio_mixer.trigger_state_changed_callback(); + DeviceSpec device; + if (card_type == CardType::FFMPEG_INPUT) { + device = DeviceSpec{InputSourceType::FFMPEG_VIDEO_INPUT, card_index - num_cards}; + } else { + device = DeviceSpec{InputSourceType::CAPTURE_CARD, card_index}; + } + audio_mixer->reset_resampler(device); + audio_mixer->set_display_name(device, card->capture->get_description()); + audio_mixer->trigger_state_changed_callback(); // Unregister old metrics, if any. if (!card->labels.empty()) { @@ -682,13 +685,22 @@ int unwrap_timecode(uint16_t current_wrapped, int last) } } +DeviceSpec card_index_to_device(unsigned card_index, unsigned num_cards) +{ + if (card_index >= num_cards) { + return DeviceSpec{InputSourceType::FFMPEG_VIDEO_INPUT, card_index - num_cards}; + } else { + return DeviceSpec{InputSourceType::CAPTURE_CARD, card_index}; + } +} + } // namespace void Mixer::bm_frame(unsigned card_index, uint16_t timecode, FrameAllocator::Frame video_frame, size_t video_offset, VideoFormat video_format, FrameAllocator::Frame audio_frame, size_t audio_offset, AudioFormat audio_format) { - DeviceSpec device{InputSourceType::CAPTURE_CARD, card_index}; + DeviceSpec device = card_index_to_device(card_index, num_cards); CaptureCard *card = &cards[card_index]; ++card->metric_input_received_frames; @@ -719,13 +731,10 @@ void Mixer::bm_frame(unsigned card_index, uint16_t timecode, } } - int64_t frame_length = int64_t(TIMEBASE) * video_format.frame_rate_den / video_format.frame_rate_nom; - assert(frame_length > 0); - size_t num_samples = (audio_frame.len > audio_offset) ? (audio_frame.len - audio_offset) / audio_format.num_channels / (audio_format.bits_per_sample / 8) : 0; - if (num_samples > OUTPUT_FREQUENCY / 10) { - printf("Card %d: Dropping frame with implausible audio length (len=%d, offset=%d) [timecode=0x%04x video_len=%d video_offset=%d video_format=%x)\n", - card_index, int(audio_frame.len), int(audio_offset), + if (num_samples > OUTPUT_FREQUENCY / 10 && card->type != CardType::FFMPEG_INPUT) { + printf("%s: Dropping frame with implausible audio length (len=%d, offset=%d) [timecode=0x%04x video_len=%d video_offset=%d video_format=%x)\n", + spec_to_string(device).c_str(), int(audio_frame.len), int(audio_offset), timecode, int(video_frame.len), int(video_offset), video_format.id); if (video_frame.owner) { video_frame.owner->release_frame(video_frame); @@ -736,6 +745,17 @@ void Mixer::bm_frame(unsigned card_index, uint16_t timecode, return; } + int64_t frame_length; + bool audio_only_frame = false; + if (video_frame.len - video_offset == 0 && num_samples > 0) { + // Audio-only frame (probably from FFmpegCapture). + frame_length = int64_t(TIMEBASE) * num_samples / OUTPUT_FREQUENCY; + audio_only_frame = true; + } else { + frame_length = int64_t(TIMEBASE) * video_format.frame_rate_den / video_format.frame_rate_nom; + } + assert(frame_length > 0); + int dropped_frames = 0; if (card->last_timecode != -1) { dropped_frames = unwrap_timecode(timecode, card->last_timecode) - card->last_timecode - 1; @@ -746,25 +766,25 @@ void Mixer::bm_frame(unsigned card_index, uint16_t timecode, const int silence_samples = OUTPUT_FREQUENCY * video_format.frame_rate_den / video_format.frame_rate_nom; if (dropped_frames > MAX_FPS * 2) { - fprintf(stderr, "Card %d lost more than two seconds (or time code jumping around; from 0x%04x to 0x%04x), resetting resampler\n", - card_index, card->last_timecode, timecode); - audio_mixer.reset_resampler(device); + fprintf(stderr, "%s lost more than two seconds (or time code jumping around; from 0x%04x to 0x%04x), resetting resampler\n", + spec_to_string(device).c_str(), card->last_timecode, timecode); + audio_mixer->reset_resampler(device); dropped_frames = 0; ++card->metric_input_resets; } else if (dropped_frames > 0) { // Insert silence as needed. - fprintf(stderr, "Card %d dropped %d frame(s) (before timecode 0x%04x), inserting silence.\n", - card_index, dropped_frames, timecode); + fprintf(stderr, "%s dropped %d frame(s) (before timecode 0x%04x), inserting silence.\n", + spec_to_string(device).c_str(), dropped_frames, timecode); card->metric_input_dropped_frames_error += dropped_frames; bool success; do { - success = audio_mixer.add_silence(device, silence_samples, dropped_frames, frame_length); + success = audio_mixer->add_silence(device, silence_samples, dropped_frames, frame_length); } while (!success); } if (num_samples > 0) { - audio_mixer.add_audio(device, audio_frame.data + audio_offset, num_samples, audio_format, frame_length, audio_frame.received_timestamp); + audio_mixer->add_audio(device, audio_frame.data + audio_offset, num_samples, audio_format, frame_length, audio_frame.received_timestamp); } // Done with the audio, so release it. @@ -799,15 +819,15 @@ void Mixer::bm_frame(unsigned card_index, uint16_t timecode, if (video_frame.len - video_offset == 0 || video_frame.len - video_offset != expected_length) { if (video_frame.len != 0) { - printf("Card %d: Dropping video frame with wrong length (%ld; expected %ld)\n", - card_index, video_frame.len - video_offset, expected_length); + printf("%s: Dropping video frame with wrong length (%ld; expected %ld)\n", + spec_to_string(device).c_str(), video_frame.len - video_offset, expected_length); } if (video_frame.owner) { video_frame.owner->release_frame(video_frame); } // Still send on the information that we _had_ a frame, even though it's corrupted, - // so that pts can go up accordingly. + // so that pts can go up accordingly. (This is also used for audio-only frames.) { unique_lock lock(card_mutex); CaptureCard::NewFrame new_frame; @@ -815,6 +835,7 @@ void Mixer::bm_frame(unsigned card_index, uint16_t timecode, new_frame.length = frame_length; new_frame.interlaced = false; new_frame.dropped_frames = dropped_frames; + new_frame.audio_only = audio_only_frame; new_frame.received_timestamp = video_frame.received_timestamp; card->new_frames.push_back(move(new_frame)); card->jitter_history.frame_arrived(video_frame.received_timestamp, frame_length, dropped_frames); @@ -980,7 +1001,7 @@ void Mixer::thread_func() } } - BasicStats basic_stats(/*verbose=*/true); + BasicStats basic_stats(/*verbose=*/true, /*use_opengl=*/true); int stats_dropped_frames = 0; while (!should_quit) { @@ -1006,7 +1027,7 @@ void Mixer::thread_func() } else { master_card_is_output = false; master_card_index = theme->map_signal(master_clock_channel); - assert(master_card_index < num_cards); + assert(master_card_index < num_cards + num_video_inputs); } OutputFrameInfo output_frame_info = get_one_frame_from_each_card(master_card_index, master_card_is_output, new_frames, has_new_frame); @@ -1016,15 +1037,17 @@ void Mixer::thread_func() handle_hotplugged_cards(); for (unsigned card_index = 0; card_index < num_cards + num_video_inputs + num_html_inputs; ++card_index) { + DeviceSpec device = card_index_to_device(card_index, num_cards); if (card_index == master_card_index || !has_new_frame[card_index]) { continue; } - if (new_frames[card_index].frame->len == 0) { + if (new_frames[card_index].frame->len == 0 && + !new_frames[card_index].audio_only) { ++new_frames[card_index].dropped_frames; } if (new_frames[card_index].dropped_frames > 0) { - printf("Card %u dropped %d frames before this\n", - card_index, int(new_frames[card_index].dropped_frames)); + printf("%s dropped %d frames before this\n", + spec_to_string(device).c_str(), int(new_frames[card_index].dropped_frames)); } } @@ -1054,7 +1077,11 @@ void Mixer::thread_func() int64_t frame_duration = output_frame_info.frame_duration; render_one_frame(frame_duration); - ++frame_num; + { + lock_guard lock(frame_num_mutex); + ++frame_num; + } + frame_num_updated.notify_all(); pts_int += frame_duration; basic_stats.update(frame_num, stats_dropped_frames); @@ -1488,7 +1515,7 @@ void Mixer::audio_thread_func() ResamplingQueue::RateAdjustmentPolicy rate_adjustment_policy = task.adjust_rate ? ResamplingQueue::ADJUST_RATE : ResamplingQueue::DO_NOT_ADJUST_RATE; - vector samples_out = audio_mixer.get_output( + vector samples_out = audio_mixer->get_output( task.frame_timestamp, task.num_samples, rate_adjustment_policy); @@ -1575,6 +1602,25 @@ map Mixer::get_available_output_video_modes() const return cards[desired_output_card_index].output->get_available_video_modes(); } +string Mixer::get_ffmpeg_filename(unsigned card_index) const +{ + assert(card_index >= num_cards && card_index < num_cards + num_video_inputs); + return ((FFmpegCapture *)(cards[card_index].capture.get()))->get_filename(); +} + +void Mixer::set_ffmpeg_filename(unsigned card_index, const string &filename) { + assert(card_index >= num_cards && card_index < num_cards + num_video_inputs); + ((FFmpegCapture *)(cards[card_index].capture.get()))->change_filename(filename); +} + +void Mixer::wait_for_next_frame() +{ + unique_lock lock(frame_num_mutex); + unsigned old_frame_num = frame_num; + frame_num_updated.wait_for(lock, seconds(1), // Timeout is just in case. + [old_frame_num, this]{ return this->frame_num > old_frame_num; }); +} + Mixer::OutputChannel::~OutputChannel() { if (has_current_frame) {