X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=nageru%2Fmjpeg_encoder.h;h=8a0d8fadb6b198fc8e6e2104eb8da41da2e17ce1;hb=f9024d141398e69e7b4011becd3ebbe37eaa1776;hp=b7b20431825b3fabffcf5da22f97c6ced4b5bb5d;hpb=a839022c035b3d9387feabc02843c166ac78b469;p=nageru

diff --git a/nageru/mjpeg_encoder.h b/nageru/mjpeg_encoder.h
index b7b2043..8a0d8fa 100644
--- a/nageru/mjpeg_encoder.h
+++ b/nageru/mjpeg_encoder.h
@@ -20,6 +20,7 @@ extern "C" {
 #include <string>
 #include <thread>
 
+#include <movit/effect.h>
 #include <va/va.h>
 
 class HTTPD;
@@ -38,13 +39,7 @@ 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);
-
-	// If the frame was started (data_copy != nullptr) but will not be finished
-	// (MJPEG decoding was turned off in the meantime), you'll need to call finish_frame()
-	// to release any VA-API resources.
-	void finish_frame(RefCountedFrame frame);
-
+	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; }
 
 	// Returns -1 for inactive (ie., don't encode frames for this card right now).
@@ -58,6 +53,7 @@ private:
 		VASurfaceID surface;
 		VAContextID context;
 		VABufferID data_buffer;
+		VAImage image;
 	};
 
 	// RAII wrapper to release VAResources on return (even on error).
@@ -109,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;
@@ -120,8 +118,9 @@ private:
 	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_audio_packet(int64_t pts, unsigned card_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);
 
 	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);
@@ -152,7 +151,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;