Make QuickSyncEncoder get its textures from ResourcePool.

[nageru] / quicksync_encoder.h

diff --git a/quicksync_encoder.h b/quicksync_encoder.h
index 495ddae48d998c00f1a927515c5330d0f0a44033..4f2bca5a3236e73fa6a3e12742922bed80cf2076 100644 (file)
--- a/quicksync_encoder.h
+++ b/quicksync_encoder.h
@@ -33,19 +33,25 @@
 #include <string>
 #include <vector>
 
-#include "mux.h"
 #include "ref_counted_frame.h"
 #include "ref_counted_gl_sync.h"
 
+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(QSurface *surface, const std::string &va_display, int width, int height, Mux *stream_mux);
+        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();
 
        void add_audio(int64_t pts, std::vector<float> audio);
@@ -53,10 +59,6 @@ public:
        RefCountedGLsync end_frame(int64_t pts, int64_t duration, const std::vector<RefCountedFrame> &input_frames);
        void shutdown();  // Blocking.
 
-       // You can only have one going at the same time.
-       void open_output_file(const std::string &filename);
-       void close_output_file();
-
 private:
        std::unique_ptr<QuickSyncEncoderImpl> impl;
 };