Make the API for begin_frame()/end_frame() in VideoEncoder a bit more sensible.

[nageru] / quicksync_encoder.h

diff --git a/quicksync_encoder.h b/quicksync_encoder.h
index 16fd3d179cd048a2d6b29e447d3209a673ecebca..caa6586f6a5b57d5fe63958e41da5506ba92ce88 100644 (file)
--- a/quicksync_encoder.h
+++ b/quicksync_encoder.h
@@ -29,8 +29,6 @@
 #include <epoxy/gl.h>
 #include <stdbool.h>
 #include <stdint.h>
-#include <atomic>
-#include <functional>
 #include <memory>
 #include <string>
 #include <vector>
@@ -39,10 +37,8 @@ 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;
@@ -55,8 +51,8 @@ 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, DiskSpaceEstimator *disk_space_estimator);
@@ -64,8 +60,8 @@ public:
 
        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.