X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=video_encoder.h;h=fc3a570a736c4867e002ec27987505d7099c6de0;hb=61919d1071d4501106bfba9edef95a714b025c8e;hp=bf203f1438cbc2b1a2138fb1764fc576fa8b93c7;hpb=1462715cd71d8f61b9e53b31c34d591d150f2df3;p=nageru

diff --git a/video_encoder.h b/video_encoder.h
index bf203f1..fc3a570 100644
--- a/video_encoder.h
+++ b/video_encoder.h
@@ -7,6 +7,7 @@
 
 #include <stdint.h>
 #include <memory>
+#include <set>
 #include <string>
 #include <vector>
 
@@ -18,10 +19,15 @@
 class HTTPD;
 class QSurface;
 class QuickSyncEncoder;
+class X264Encoder;
 
-class VideoEncoder : public KeyFrameSignalReceiver {
+namespace movit {
+class ResourcePool;
+}  // namespace movit
+
+class VideoEncoder {
 public:
-	VideoEncoder(QSurface *surface, const std::string &va_display, int width, int height, HTTPD *httpd);
+	VideoEncoder(movit::ResourcePool *resource_pool, QSurface *surface, const std::string &va_display, int width, int height, HTTPD *httpd);
 	~VideoEncoder();
 
 	void add_audio(int64_t pts, std::vector<float> audio);
@@ -31,17 +37,15 @@ public:
 	// Does a cut of the disk stream immediately ("frame" is used for the filename only).
 	void do_cut(int frame);
 
-	virtual void signal_keyframe() override {
-		stream_mux_writing_keyframes = true;
-	}
-
 private:
 	void open_output_stream();
-	void close_output_stream();
-	static int write_packet_thunk(void *opaque, uint8_t *buf, int buf_size);
-	int write_packet(uint8_t *buf, int buf_size);
+	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::unique_ptr<QuickSyncEncoder> quicksync_encoder;
+	AVOutputFormat *oformat;
+	std::mutex qs_mu;
+	std::unique_ptr<QuickSyncEncoder> quicksync_encoder;  // Under <qs_mu>.
+	movit::ResourcePool *resource_pool;
 	QSurface *surface;
 	std::string va_display;
 	int width, height;
@@ -49,13 +53,15 @@ private:
 
 	std::unique_ptr<Mux> stream_mux;  // To HTTP.
 	std::unique_ptr<AudioEncoder> stream_audio_encoder;
+	std::unique_ptr<X264Encoder> x264_encoder;  // nullptr if not using x264.
 
-	// While Mux object is constructing, <stream_mux_writing_header> is true,
-	// and the header is being collected into stream_mux_header.
-	bool stream_mux_writing_header;
 	std::string stream_mux_header;
 
-	bool stream_mux_writing_keyframes = false;
+	std::atomic<int> quicksync_encoders_in_shutdown{0};
+
+	// Encoders that are shutdown, but need to call release_gl_resources()
+	// (or be deleted) from some thread with an OpenGL context.
+	std::vector<std::unique_ptr<QuickSyncEncoder>> qs_needing_cleanup;  // Under <qs_mu>.
 };
 
 #endif