X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=video_encoder.h;h=92f83572006ee8119fb102fb4b92b4d2638164f5;hb=7017a3bd997cbf5d7c327187afecfecd610bf24d;hp=489d9d318c9c9650846f939c8ab82f93b295ea00;hpb=90d0745245f83999e88bc50cad57be3e4a1c7439;p=nageru

diff --git a/video_encoder.h b/video_encoder.h
index 489d9d3..92f8357 100644
--- a/video_encoder.h
+++ b/video_encoder.h
@@ -7,9 +7,11 @@
 
 #include <stdint.h>
 #include <memory>
+#include <set>
 #include <string>
 #include <vector>
 
+#include "audio_encoder.h"
 #include "mux.h"
 #include "ref_counted_frame.h"
 #include "ref_counted_gl_sync.h"
@@ -17,10 +19,15 @@
 class HTTPD;
 class QSurface;
 class QuickSyncEncoder;
+class X264Encoder;
+
+namespace movit {
+class ResourcePool;
+}  // namespace movit
 
 class VideoEncoder : public KeyFrameSignalReceiver {
 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);
@@ -36,17 +43,21 @@ public:
 
 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);
 
-	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;
 	HTTPD *httpd;
 
 	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.
@@ -54,6 +65,12 @@ private:
 	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