X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=quicksync_encoder.h;h=25b19725dee6841faf83c453af49fab38a279ca3;hb=ab03e5e6f24b1651b4ca7df95e20aa5786939209;hp=9ec7c85b88a28e76777b8474ec6449fdd61eceaa;hpb=1462715cd71d8f61b9e53b31c34d591d150f2df3;p=nageru

diff --git a/quicksync_encoder.h b/quicksync_encoder.h
index 9ec7c85..25b1972 100644
--- a/quicksync_encoder.h
+++ b/quicksync_encoder.h
@@ -33,6 +33,10 @@
 #include <string>
 #include <vector>
 
+extern "C" {
+#include <libavformat/avformat.h>
+}
+
 #include "ref_counted_frame.h"
 #include "ref_counted_gl_sync.h"
 
@@ -40,19 +44,26 @@ class AudioEncoder;
 class Mux;
 class QuickSyncEncoderImpl;
 class QSurface;
+class X264Encoder;
+
+namespace movit {
+class ResourcePool;
+}  // namespace movit
 
 // This is just a pimpl, because including anything X11-related in a .h file
 // tends to trip up Qt. All the real logic is in QuickSyncEncoderImpl, defined in the
 // .cpp file.
 class QuickSyncEncoder {
 public:
-        QuickSyncEncoder(const std::string &filename, QSurface *surface, const std::string &va_display, int width, int height, Mux *stream_mux, AudioEncoder *stream_audio_encoder);
+        QuickSyncEncoder(const std::string &filename, movit::ResourcePool *resource_pool, QSurface *surface, const std::string &va_display, int width, int height, AVOutputFormat *oformat, AudioEncoder *stream_audio_encoder, X264Encoder *x264_encoder);
         ~QuickSyncEncoder();
 
+	void set_stream_mux(Mux *mux);  // Does not take ownership. Must be called unless x264 is used for the stream.
 	void add_audio(int64_t pts, std::vector<float> audio);
 	bool begin_frame(GLuint *y_tex, GLuint *cbcr_tex);
 	RefCountedGLsync end_frame(int64_t pts, int64_t duration, const std::vector<RefCountedFrame> &input_frames);
-	void shutdown();  // Blocking.
+	void shutdown();  // Blocking. Does not require an OpenGL context.
+	void release_gl_resources();  // Requires an OpenGL context. Must be run after shutdown.
 
 private:
 	std::unique_ptr<QuickSyncEncoderImpl> impl;