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

diff --git a/quicksync_encoder.h b/quicksync_encoder.h
index 4f2bca5..caa6586 100644
--- a/quicksync_encoder.h
+++ b/quicksync_encoder.h
@@ -27,19 +27,23 @@
 #define _H264ENCODE_H
 
 #include <epoxy/gl.h>
+#include <stdbool.h>
 #include <stdint.h>
-#include <atomic>
 #include <memory>
 #include <string>
 #include <vector>
 
-#include "ref_counted_frame.h"
+extern "C" {
+#include <libavformat/avformat.h>
+}
+
 #include "ref_counted_gl_sync.h"
 
-class AudioEncoder;
+class DiskSpaceEstimator;
 class Mux;
-class QuickSyncEncoderImpl;
 class QSurface;
+class QuickSyncEncoderImpl;
+class RefCountedFrame;
 class X264Encoder;
 
 namespace movit {
@@ -47,17 +51,20 @@ 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.
+// tends to trip up Qt. All the real logic is in QuickSyncEncoderImpl,
+// defined in quicksync_encoder_impl.h.
 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, DiskSpaceEstimator *disk_space_estimator);
         ~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.
+	bool begin_frame(int64_t pts, int64_t duration, const std::vector<RefCountedFrame> &input_frames, GLuint *y_tex, GLuint *cbcr_tex);
+	RefCountedGLsync end_frame();
+	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;