X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=nageru%2Fmjpeg_encoder.h;h=3630d9f26a6f94048b0c3df0b9a9593955948c1a;hb=c913b0254382c2a1bd7410d720e45dfc63223c9c;hp=f3c9d9946aec6b8e301f80b0583b072deffc459d;hpb=c1b4f6c5e8a1fe046f6dddf62ef705f4f799789a;p=nageru

diff --git a/nageru/mjpeg_encoder.h b/nageru/mjpeg_encoder.h
index f3c9d99..3630d9f 100644
--- a/nageru/mjpeg_encoder.h
+++ b/nageru/mjpeg_encoder.h
@@ -37,31 +37,86 @@ public:
 private:
 	static constexpr int quality = 90;
 
+	struct VAResources {
+		unsigned width, height;
+		VASurfaceID surface;
+		VAContextID context;
+		VABufferID data_buffer;
+	};
+
+	// RAII wrapper to release VAResources on return (even on error).
+	class ReleaseVAResources {
+	public:
+		ReleaseVAResources() : committed(true) {}
+
+		ReleaseVAResources(MJPEGEncoder *mjpeg, const VAResources &resources)
+			: mjpeg(mjpeg), resources(resources) {}
+
+		ReleaseVAResources(ReleaseVAResources &) = delete;
+
+		ReleaseVAResources(ReleaseVAResources &&other)
+			: mjpeg(other.mjpeg), resources(other.resources), committed(other.committed) {
+			other.commit();
+		}
+
+		ReleaseVAResources &operator= (ReleaseVAResources &) = delete;
+
+		ReleaseVAResources &operator= (ReleaseVAResources &&other) {
+			if (!committed) {
+				mjpeg->release_va_resources(resources);
+			}
+			mjpeg = other.mjpeg;
+			resources = std::move(other.resources);
+			committed = other.committed;
+			other.commit();
+			return *this;
+		}
+
+		~ReleaseVAResources()
+		{
+			if (!committed) {
+				mjpeg->release_va_resources(resources);
+			}
+		}
+
+		void commit() { committed = true; }
+
+	private:
+		MJPEGEncoder *mjpeg = nullptr;
+		VAResources resources;
+		bool committed = false;
+	};
+
 	struct QueuedFrame {
 		int64_t pts;
 		unsigned card_index;
 		RefCountedFrame frame;
 		bmusb::VideoFormat video_format;
 		size_t y_offset, cbcr_offset;
+
+		// Only for frames in the process of being encoded by VA-API.
+		VAResources resources;
+		ReleaseVAResources resource_releaser;
 	};
 
 	void encoder_thread_func();
-	std::vector<uint8_t> encode_jpeg(const QueuedFrame &qf);
-	std::vector<uint8_t> encode_jpeg_va(const QueuedFrame &qf);
+	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 std::vector<uint8_t> &jpeg);
 	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);
 
 	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);
 
-	std::thread encoder_thread;
+	std::thread encoder_thread, va_receiver_thread;
 
 	std::mutex mu;
 	std::queue<QueuedFrame> frames_to_be_encoded;  // Under mu.
-	std::condition_variable any_frames_to_be_encoded;
+	std::condition_variable any_frames_to_be_encoded;  // Governs changes in both frames_to_be_encoded and frames_under_encoding
 
-	std::queue<QueuedFrame> frames_encoding;  // Under mu.
+	std::queue<QueuedFrame> frames_encoding;  // Under mu. Used for VA-API only.
 	std::condition_variable any_frames_encoding;
 
 	AVFormatContextWithCloser avctx;
@@ -83,40 +138,14 @@ private:
 	std::map<std::pair<unsigned, unsigned>, VAData> va_data_for_resolution;
 	VAData get_va_data_for_resolution(unsigned width, unsigned height);
 
-	struct VAResources {
-		unsigned width, height;
-		VASurfaceID surface;
-		VAContextID context;
-		VABufferID data_buffer;
-	};
 	std::list<VAResources> va_resources_freelist;
 	std::mutex va_resources_mutex;
 	VAResources get_va_resources(unsigned width, unsigned height);
 	void release_va_resources(VAResources resources);
 
-	// RAII wrapper to release VAResources on return (even on error).
-	class ReleaseVAResources {
-	public:
-		ReleaseVAResources(MJPEGEncoder *mjpeg, const VAResources &resources)
-			: mjpeg(mjpeg), resources(resources) {}
-		~ReleaseVAResources()
-		{
-			if (!committed) {
-				mjpeg->release_va_resources(resources);
-			}
-		}
-
-		void commit() { committed = true; }
-
-	private:
-		MJPEGEncoder * const mjpeg;
-		const VAResources &resources;
-		bool committed = false;
-	};
-
 	static std::unique_ptr<VADisplayWithCleanup> try_open_va(const std::string &va_display, std::string *error, VAConfigID *config_id);
 
-	uint8_t *tmp_y, *tmp_cbcr, *tmp_cb, *tmp_cr;  // Private to the encoder thread.
+	uint8_t *tmp_y, *tmp_cbcr, *tmp_cb, *tmp_cr;  // Private to the encoder thread. Used by the libjpeg backend only.
 };
 
 #endif  // !defined(_MJPEG_ENCODER_H)