X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=mixer.h;h=bf53c2482e23362e0cba1ff589cbf72d76d78dd0;hb=d7bba4abb3d56893399578f0540b9ded0a28380f;hp=45311aa42ec98af08cf7fb55719c16e3e01c0041;hpb=02083dca89292d6ba95642cf8957f1cee8826313;p=nageru diff --git a/mixer.h b/mixer.h index 45311aa..bf53c24 100644 --- a/mixer.h +++ b/mixer.h @@ -5,20 +5,39 @@ #include #undef Success +#include +#include + #include #include +#include +#include #include +#include +#include +#include +#include +#include #include "bmusb/bmusb.h" +#include "ebu_r128_proc.h" #include "h264encode.h" +#include "httpd.h" #include "pbo_frame_allocator.h" #include "ref_counted_frame.h" #include "ref_counted_gl_sync.h" -#include "theme.h" #include "resampler.h" +#include "theme.h" #include "timebase.h" -#define NUM_CARDS 2 +class H264Encoder; +class QSurface; +namespace movit { +class Effect; +class EffectChain; +class FlatInput; +class ResourcePool; +} // namespace movit namespace movit { class YCbCrInput; @@ -29,7 +48,7 @@ class QSurfaceFormat; class Mixer { public: // The surface format is used for offscreen destinations for OpenGL contexts we need. - Mixer(const QSurfaceFormat &format); + Mixer(const QSurfaceFormat &format, unsigned num_cards); ~Mixer(); void start(); void quit(); @@ -79,13 +98,19 @@ public: output_channel[output].set_frame_ready_callback(callback); } + typedef std::function audio_level_callback_t; + void set_audio_level_callback(audio_level_callback_t callback) + { + audio_level_callback = callback; + } + std::vector get_transition_names() { return theme->get_transition_names(pts()); } private: - void bm_frame(int card_index, uint16_t timecode, + void bm_frame(unsigned card_index, uint16_t timecode, FrameAllocator::Frame video_frame, size_t video_offset, uint16_t video_format, FrameAllocator::Frame audio_frame, size_t audio_offset, uint16_t audio_format); void place_rectangle(movit::Effect *resample_effect, movit::Effect *padding_effect, float x0, float y0, float x1, float y1); @@ -94,6 +119,9 @@ private: void release_display_frame(DisplayFrame *frame); double pts() { return double(pts_int) / TIMEBASE; } + HTTPD httpd; + unsigned num_cards; + QSurface *mixer_surface, *h264_encoder_surface; std::unique_ptr resource_pool; std::unique_ptr theme; @@ -127,9 +155,9 @@ private: std::unique_ptr resampler; // Under audio_mutex. int last_timecode = -1; // Unwrapped. }; - CaptureCard cards[NUM_CARDS]; // protected by + CaptureCard cards[MAX_CARDS]; // protected by - RefCountedFrame bmusb_current_rendering_frame[NUM_CARDS]; + RefCountedFrame bmusb_current_rendering_frame[MAX_CARDS]; class OutputChannel { public: @@ -152,6 +180,12 @@ private: std::thread mixer_thread; bool should_quit = false; + + audio_level_callback_t audio_level_callback = nullptr; + Ebu_r128_proc r128; + + // TODO: Implement oversampled peak detection. + float peak = 0.0f; }; extern Mixer *global_mixer;