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

diff --git a/quicksync_encoder.h b/quicksync_encoder.h
index c1e844b..caa6586 100644
--- a/quicksync_encoder.h
+++ b/quicksync_encoder.h
@@ -29,7 +29,6 @@
 #include <epoxy/gl.h>
 #include <stdbool.h>
 #include <stdint.h>
-#include <atomic>
 #include <memory>
 #include <string>
 #include <vector>
@@ -38,10 +37,9 @@ extern "C" {
 #include <libavformat/avformat.h>
 }
 
-#include "ref_counted_frame.h"
 #include "ref_counted_gl_sync.h"
 
-class AudioEncoder;
+class DiskSpaceEstimator;
 class Mux;
 class QSurface;
 class QuickSyncEncoderImpl;
@@ -53,17 +51,17 @@ 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, AVOutputFormat *oformat, 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);
+	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.