Fix a comment typo.

[nageru] / nageru / mixer.h

diff --git a/nageru/mixer.h b/nageru/mixer.h
index 992bcb9b182e08d8fcfb19ffc82f0bd143914b4c..49afa7f1f2f7a0e1ce7254e05e0bef3b2b6f8027 100644 (file)
--- a/nageru/mixer.h
+++ b/nageru/mixer.h
@@ -23,17 +23,18 @@
 #include <thread>
 #include <vector>
 
+#include <movit/effect.h>
 #include <movit/image_format.h>
 
 #include "audio_mixer.h"
 #include "bmusb/bmusb.h"
 #include "defs.h"
-#include "httpd.h"
+#include "shared/httpd.h"
 #include "input_state.h"
 #include "libusb.h"
 #include "pbo_frame_allocator.h"
 #include "ref_counted_frame.h"
-#include "ref_counted_gl_sync.h"
+#include "shared/ref_counted_gl_sync.h"
 #include "theme.h"
 #include "shared/timebase.h"
 #include "video_encoder.h"
@@ -42,6 +43,7 @@
 class ALSAOutput;
 class ChromaSubsampler;
 class DeckLinkOutput;
+class MJPEGEncoder;
 class QSurface;
 class QSurfaceFormat;
 class TimecodeRenderer;
@@ -287,6 +289,11 @@ public:
                theme->set_wb(channel, r, g, b);
        }
 
+       std::string format_status_line(const std::string &disk_space_left_text, double file_length_seconds)
+       {
+               return theme->format_status_line(disk_space_left_text, file_length_seconds);
+       }
+
        // Note: You can also get this through the global variable global_audio_mixer.
        AudioMixer *get_audio_mixer() { return audio_mixer.get(); }
        const AudioMixer *get_audio_mixer() const { return audio_mixer.get(); }
@@ -412,7 +419,7 @@ public:
                return httpd.get_num_connected_clients();
        }
 
-       std::vector<Theme::MenuEntry> get_theme_menu() { return theme->get_theme_menu(); }
+       Theme::MenuEntry *get_theme_menu() { return theme->get_theme_menu(); }
 
        void theme_menu_entry_clicked(int lua_ref) { return theme->theme_menu_entry_clicked(lua_ref); }
 
@@ -455,7 +462,7 @@ private:
        HTTPD httpd;
        unsigned num_cards, num_video_inputs, num_html_inputs = 0;
 
-       QSurface *mixer_surface, *h264_encoder_surface, *decklink_output_surface;
+       QSurface *mixer_surface, *h264_encoder_surface, *decklink_output_surface, *image_update_surface;
        std::unique_ptr<movit::ResourcePool> resource_pool;
        std::unique_ptr<Theme> theme;
        std::atomic<unsigned> audio_source_channel{0};
@@ -475,6 +482,7 @@ private:
        std::unique_ptr<ChromaSubsampler> chroma_subsampler;
        std::unique_ptr<v210Converter> v210_converter;
        std::unique_ptr<VideoEncoder> video_encoder;
+       std::unique_ptr<MJPEGEncoder> mjpeg_encoder;
 
        std::unique_ptr<TimecodeRenderer> timecode_renderer;
        std::atomic<bool> display_timecode_in_stream{false};
@@ -530,12 +538,20 @@ private:
                        std::function<void()> 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();
+                       movit::RGBTriplet neutral_color{1.0f, 1.0f, 1.0f};
+
+                       // 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<NewFrame> new_frames;
                std::condition_variable new_frames_changed;  // Set whenever new_frames is changed.
-
                QueueLengthPolicy queue_length_policy;  // Refers to the "new_frames" queue.
 
+               std::vector<int32_t> new_raw_audio;
+
                int last_timecode = -1;  // Unwrapped.
 
                JitterHistory jitter_history;
@@ -561,6 +577,7 @@ private:
        JitterHistory output_jitter_history;
        CaptureCard cards[MAX_VIDEO_CARDS];  // Protected by <card_mutex>.
        YCbCrInterpretation ycbcr_interpretation[MAX_VIDEO_CARDS];  // Protected by <card_mutex>.
+       movit::RGBTriplet last_received_neutral_color[MAX_VIDEO_CARDS];  // Used by the mixer thread only. Constructor-initialiezd.
        std::unique_ptr<AudioMixer> 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 {
@@ -570,7 +587,7 @@ private:
                bool is_preroll;
                std::chrono::steady_clock::time_point frame_timestamp;
        };
-       OutputFrameInfo get_one_frame_from_each_card(unsigned master_card_index, bool master_card_is_output, CaptureCard::NewFrame new_frames[MAX_VIDEO_CARDS], bool has_new_frame[MAX_VIDEO_CARDS]);
+       OutputFrameInfo get_one_frame_from_each_card(unsigned master_card_index, bool master_card_is_output, CaptureCard::NewFrame new_frames[MAX_VIDEO_CARDS], bool has_new_frame[MAX_VIDEO_CARDS], std::vector<int32_t> raw_audio[MAX_VIDEO_CARDS]);
 
        InputState input_state;