X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=quicksync_encoder.h;h=e55fd4dce115f7c6720de791bda963c8e0f89304;hb=250b625dce74506b718f5caf3d1ae9acb84e4bfb;hp=4f2bca5a3236e73fa6a3e12742922bed80cf2076;hpb=4b286cabe961c426ce340a85167346012691d711;p=nageru

diff --git a/quicksync_encoder.h b/quicksync_encoder.h
index 4f2bca5..e55fd4d 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"
 
@@ -51,13 +55,16 @@ class ResourcePool;
 // .cpp file.
 class QuickSyncEncoder {
 public:
-        QuickSyncEncoder(const std::string &filename, movit::ResourcePool *resource_pool, QSurface *surface, const std::string &va_display, int width, int height, Mux *stream_mux, AudioEncoder *stream_audio_encoder, X264Encoder *x264_encoder);
+        QuickSyncEncoder(const std::string &filename, movit::ResourcePool *resource_pool, QSurface *surface, const std::string &va_display, int width, int height, AVOutputFormat *oformat, 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.
+	int64_t global_delay() const;  // So we never get negative dts.
 
 private:
 	std::unique_ptr<QuickSyncEncoderImpl> impl;