X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=nageru%2Fmixer.h;h=5af2016a74bae1d4a241d224f78f300e53463bca;hb=392edbde947cee264632b8f3c348a1a5f2776aa6;hp=2c394494a932561bdd99499e921295c8eeda6fe4;hpb=7188e3e948c60f78f5e2cd8756337f716de06d99;p=nageru

diff --git a/nageru/mixer.h b/nageru/mixer.h
index 2c39449..5af2016 100644
--- a/nageru/mixer.h
+++ b/nageru/mixer.h
@@ -28,7 +28,7 @@
 #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"
@@ -42,6 +42,7 @@
 class ALSAOutput;
 class ChromaSubsampler;
 class DeckLinkOutput;
+class MJPEGEncoder;
 class QSurface;
 class QSurfaceFormat;
 class TimecodeRenderer;
@@ -455,7 +456,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 +476,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 +532,19 @@ 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();
+
+			// 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;
@@ -570,7 +579,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;