X-Git-Url: https://git.sesse.net/?p=nageru;a=blobdiff_plain;f=nageru%2Fmjpeg_encoder.h;h=6ba7f0381bad3a1f3f1ec879e07cf44dcaf7260b;hp=8b68294a48d9e01dfd0254b213b2770d57e0330d;hb=bcd177e1daf5a63d7bf877bc5d30d8803dfd472c;hpb=0b776ba19a0b0703f87e5529b2e4f82af6b50435

diff --git a/nageru/mjpeg_encoder.h b/nageru/mjpeg_encoder.h
index 8b68294..6ba7f03 100644
--- a/nageru/mjpeg_encoder.h
+++ b/nageru/mjpeg_encoder.h
@@ -1,7 +1,9 @@
 #ifndef _MJPEG_ENCODER_H
 #define _MJPEG_ENCODER_H 1
 
+#include "defs.h"
 #include "shared/ffmpeg_raii.h"
+#include "shared/httpd.h"
 #include "ref_counted_frame.h"
 
 extern "C" {
@@ -20,19 +22,28 @@ extern "C" {
 #include <string>
 #include <thread>
 
+#include <movit/effect.h>
 #include <va/va.h>
 
-class HTTPD;
 struct jpeg_compress_struct;
 struct VADisplayWithCleanup;
 struct VectorDestinationManager;
 
+#define CHECK_VASTATUS(va_status, func)                                 \
+    if (va_status != VA_STATUS_SUCCESS) {                               \
+        fprintf(stderr, "%s:%d (%s) failed with %d\n", __func__, __LINE__, func, va_status); \
+        exit(1);                                                        \
+    }
+
 class MJPEGEncoder {
 public:
 	MJPEGEncoder(HTTPD *httpd, const std::string &va_display);
 	~MJPEGEncoder();
 	void stop();
-	void upload_frame(int64_t pts, unsigned card_index, RefCountedFrame frame, const bmusb::VideoFormat &video_format, size_t y_offset, size_t cbcr_offset);
+	void upload_frame(int64_t pts, unsigned card_index, RefCountedFrame frame, const bmusb::VideoFormat &video_format, size_t y_offset, size_t cbcr_offset, std::vector<int32_t> audio, const movit::RGBTriplet &white_balance);
+	bool using_vaapi() const { return va_dpy != nullptr; }
+
+	bool should_encode_mjpeg_for_card(unsigned card_index);
 
 private:
 	static constexpr int quality = 90;
@@ -42,6 +53,7 @@ private:
 		VASurfaceID surface;
 		VAContextID context;
 		VABufferID data_buffer;
+		VAImage image;
 	};
 
 	// RAII wrapper to release VAResources on return (even on error).
@@ -93,6 +105,8 @@ private:
 		RefCountedFrame frame;
 		bmusb::VideoFormat video_format;
 		size_t y_offset, cbcr_offset;
+		std::vector<int32_t> audio;
+		movit::RGBTriplet white_balance;
 
 		// Only for frames in the process of being encoded by VA-API.
 		VAResources resources;
@@ -103,12 +117,21 @@ private:
 	void va_receiver_thread_func();
 	void encode_jpeg_va(QueuedFrame &&qf);
 	std::vector<uint8_t> encode_jpeg_libjpeg(const QueuedFrame &qf);
-	void write_mjpeg_packet(int64_t pts, unsigned card_index, const uint8_t *jpeg, size_t jpeg_size);
-	void init_jpeg_422(unsigned width, unsigned height, VectorDestinationManager *dest, jpeg_compress_struct *cinfo);
-	std::vector<uint8_t> get_jpeg_header(unsigned width, unsigned height, jpeg_compress_struct *cinfo);
-
+	void write_mjpeg_packet(AVFormatContext *avctx, int64_t pts, unsigned stream_index, const uint8_t *jpeg, size_t jpeg_size);
+	void write_audio_packet(AVFormatContext *avctx, int64_t pts, unsigned stream_index, const std::vector<int32_t> &audio);
+	void init_jpeg_422(unsigned width, unsigned height, const movit::RGBTriplet &white_balance, VectorDestinationManager *dest, jpeg_compress_struct *cinfo);
+	std::vector<uint8_t> get_jpeg_header(unsigned width, unsigned height, const movit::RGBTriplet &white_balance, jpeg_compress_struct *cinfo);
+	void add_stream(HTTPD::StreamID stream_id);  // Can only be called from the constructor, or the thread owning <streams>.
+	void update_siphon_streams();  // Same.
+	void create_ffmpeg_context(HTTPD::StreamID stream_id);
+
+	struct WritePacket2Context {
+		MJPEGEncoder *mjpeg_encoder;
+		HTTPD::StreamID stream_id;
+	};
+	std::map<HTTPD::StreamID, WritePacket2Context> ffmpeg_contexts;   // Statically set up, so we never need to worry about dangling pointers.
 	static int write_packet2_thunk(void *opaque, uint8_t *buf, int buf_size, AVIODataMarkerType type, int64_t time);
-	int write_packet2(uint8_t *buf, int buf_size, AVIODataMarkerType type, int64_t time);
+	int write_packet2(HTTPD::StreamID stream_id, uint8_t *buf, int buf_size, AVIODataMarkerType type, int64_t time);
 
 	std::thread encoder_thread, va_receiver_thread;
 
@@ -119,9 +142,12 @@ private:
 	std::queue<QueuedFrame> frames_encoding;  // Under mu. Used for VA-API only.
 	std::condition_variable any_frames_encoding;
 
-	AVFormatContextWithCloser avctx;
+	struct Stream {
+		AVFormatContextWithCloser avctx;
+		std::string mux_header;
+	};
+	std::map<HTTPD::StreamID, Stream> streams;  // Owned by the VA-API receiver thread if VA-API is active, or the encoder thread if not.
 	HTTPD *httpd;
-	std::string mux_header;
 	std::atomic<bool> should_quit{false};
 	bool running = false;
 
@@ -136,7 +162,7 @@ private:
 		VAEncSliceParameterBufferJPEG parms;
 	};
 	std::map<std::pair<unsigned, unsigned>, VAData> va_data_for_resolution;
-	VAData get_va_data_for_resolution(unsigned width, unsigned height);
+	VAData get_va_data_for_resolution(unsigned width, unsigned height, const movit::RGBTriplet &white_balance);
 
 	std::list<VAResources> va_resources_freelist;
 	std::mutex va_resources_mutex;
@@ -153,6 +179,8 @@ private:
 	std::atomic<int64_t> metric_mjpeg_frames_oversized_dropped{0};
 	std::atomic<int64_t> metric_mjpeg_overrun_dropped{0};
 	std::atomic<int64_t> metric_mjpeg_overrun_submitted{0};
+
+	friend class PBOFrameAllocator;  // FIXME
 };
 
 #endif  // !defined(_MJPEG_ENCODER_H)