Make the VideoEncoder own the stream audio encoder (and make it unconditionally)...

[nageru] / quicksync_encoder.h

diff --git a/quicksync_encoder.h b/quicksync_encoder.h
index 3c98a1b24d9264771ef8b10481e57cc8b7dd39fe..9ec7c85b88a28e76777b8474ec6449fdd61eceaa 100644 (file)
--- a/quicksync_encoder.h
+++ b/quicksync_encoder.h
@@ -36,8 +36,9 @@
 #include "ref_counted_frame.h"
 #include "ref_counted_gl_sync.h"
 
+class AudioEncoder;
+class Mux;
 class QuickSyncEncoderImpl;
-class HTTPD;
 class QSurface;
 
 // This is just a pimpl, because including anything X11-related in a .h file
@@ -45,7 +46,7 @@ class QSurface;
 // .cpp file.
 class QuickSyncEncoder {
 public:
-        QuickSyncEncoder(QSurface *surface, const std::string &va_display, int width, int height, HTTPD *httpd);
+        QuickSyncEncoder(const std::string &filename, QSurface *surface, const std::string &va_display, int width, int height, Mux *stream_mux, AudioEncoder *stream_audio_encoder);
         ~QuickSyncEncoder();
 
        void add_audio(int64_t pts, std::vector<float> audio);
@@ -53,10 +54,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;
 };