X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=mixer.h;h=84313e5130b0816b2a997ee9265d637781cb3aed;hb=817fffe1ef3bd87f2387395f49487cf5255d8daf;hp=1d2e200ca45be9acb886f487b30ff5d2f478805a;hpb=33929966f03efc11d23d4ec5fdf492ff09c2ab9e;p=nageru diff --git a/mixer.h b/mixer.h index 1d2e200..84313e5 100644 --- a/mixer.h +++ b/mixer.h @@ -42,6 +42,7 @@ class ALSAOutput; class ChromaSubsampler; class DeckLinkOutput; +class MJPEGEncoder; class QSurface; class QSurfaceFormat; class TimecodeRenderer; @@ -288,8 +289,8 @@ public: } // Note: You can also get this through the global variable global_audio_mixer. - AudioMixer *get_audio_mixer() { return &audio_mixer; } - const AudioMixer *get_audio_mixer() const { return &audio_mixer; } + AudioMixer *get_audio_mixer() { return audio_mixer.get(); } + const AudioMixer *get_audio_mixer() const { return audio_mixer.get(); } void schedule_cut() { @@ -322,6 +323,11 @@ public: return cards[card_index].output != nullptr; } + bool card_is_ffmpeg(unsigned card_index) const { + assert(card_index < num_cards + num_video_inputs); + return cards[card_index].type == CardType::FFMPEG_INPUT; + } + std::map get_available_video_modes(unsigned card_index) const { assert(card_index < num_cards); return cards[card_index].capture->get_available_video_modes(); @@ -369,6 +375,10 @@ public: cards[card_index].capture->set_audio_input(input); } + std::string get_ffmpeg_filename(unsigned card_index) const; + + void set_ffmpeg_filename(unsigned card_index, const std::string &filename); + void change_x264_bitrate(unsigned rate_kbit) { video_encoder->change_x264_bitrate(rate_kbit); } @@ -403,13 +413,25 @@ public: return httpd.get_num_connected_clients(); } + std::vector get_theme_menu() { return theme->get_theme_menu(); } + + void theme_menu_entry_clicked(int lua_ref) { return theme->theme_menu_entry_clicked(lua_ref); } + + void set_theme_menu_callback(std::function callback) + { + theme->set_theme_menu_callback(callback); + } + + void wait_for_next_frame(); + private: struct CaptureCard; enum class CardType { LIVE_CARD, FAKE_CAPTURE, - FFMPEG_INPUT + FFMPEG_INPUT, + CEF_INPUT, }; void configure_card(unsigned card_index, bmusb::CaptureInterface *capture, CardType card_type, DeckLinkOutput *output); void set_output_card_internal(int card_index); // Should only be called from the mixer thread. @@ -428,9 +450,11 @@ private: void release_display_frame(DisplayFrame *frame); double pts() { return double(pts_int) / TIMEBASE; } void trim_queue(CaptureCard *card, size_t safe_queue_length); + std::pair get_channels_json(); + std::pair get_channel_color_http(unsigned channel_idx); HTTPD httpd; - unsigned num_cards, num_video_inputs; + unsigned num_cards, num_video_inputs, num_html_inputs = 0; QSurface *mixer_surface, *h264_encoder_surface, *decklink_output_surface; std::unique_ptr resource_pool; @@ -452,6 +476,7 @@ private: std::unique_ptr chroma_subsampler; std::unique_ptr v210_converter; std::unique_ptr video_encoder; + std::unique_ptr mjpeg_encoder; std::unique_ptr timecode_renderer; std::atomic display_timecode_in_stream{false}; @@ -461,7 +486,10 @@ private: movit::YCbCrInput *display_input; int64_t pts_int = 0; // In TIMEBASE units. - unsigned frame_num = 0; + + mutable std::mutex frame_num_mutex; + std::condition_variable frame_num_updated; + unsigned frame_num = 0; // Under . // Accumulated errors in number of 1/TIMEBASE audio samples. If OUTPUT_FREQUENCY divided by // frame rate is integer, will always stay zero. @@ -475,6 +503,15 @@ private: CardType type; std::unique_ptr output; + // CEF only delivers frames when it actually has a change. + // If we trim the queue for latency reasons, we could thus + // end up in a situation trimming a frame that was meant to + // be displayed for a long time, which is really suboptimal. + // Thus, if we drop the last frame we have, may_have_dropped_last_frame + // is set to true, and the next starvation event will trigger + // us requestin a CEF repaint. + bool is_cef_capture, may_have_dropped_last_frame = false; + // If this card is used for output (ie., output_card_index points to it), // it cannot simultaneously be uesd for capture, so gets replaced // by a FakeCapture. However, since reconstructing the real capture object @@ -495,10 +532,15 @@ private: std::function upload_func; // Needs to be called to actually upload the texture to OpenGL. unsigned dropped_frames = 0; // Number of dropped frames before this one. std::chrono::steady_clock::time_point received_timestamp = std::chrono::steady_clock::time_point::min(); + + // Used for MJPEG encoding. (upload_func packs everything it needs + // into the functor, but would otherwise also use these.) + // width=0 or height=0 means a broken frame, ie., do not upload. + bmusb::VideoFormat video_format; + size_t y_offset, cbcr_offset; }; std::deque new_frames; - bool should_quit = false; - std::condition_variable new_frames_changed; // Set whenever new_frames (or should_quit) is changed. + std::condition_variable new_frames_changed; // Set whenever new_frames is changed. QueueLengthPolicy queue_length_policy; // Refers to the "new_frames" queue. @@ -527,7 +569,7 @@ private: JitterHistory output_jitter_history; CaptureCard cards[MAX_VIDEO_CARDS]; // Protected by . YCbCrInterpretation ycbcr_interpretation[MAX_VIDEO_CARDS]; // Protected by . - AudioMixer audio_mixer; // Same as global_audio_mixer (see audio_mixer.h). + std::unique_ptr audio_mixer; // Same as global_audio_mixer (see audio_mixer.h). bool input_card_is_master_clock(unsigned card_index, unsigned master_card_index) const; struct OutputFrameInfo { int dropped_frames; // Since last frame.