X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=quicksync_encoder.h;h=52aaf77dd48d4ac4007c121189ce3d295dd14640;hb=3be00c8dd8b841cecc44f57234b9fc2d3a94cb45;hp=994987ebd6afaf8f517e5d7c32a90f8b8fa498bc;hpb=2804eb55c7d4f9f6d70203d106d0f1e69b19c2ee;p=nageru

diff --git a/quicksync_encoder.h b/quicksync_encoder.h
index 994987e..52aaf77 100644
--- a/quicksync_encoder.h
+++ b/quicksync_encoder.h
@@ -33,21 +33,32 @@
 #include <string>
 #include <vector>
 
-#include "mux.h"
+extern "C" {
+#include <libavformat/avformat.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(const std::string &filename, 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, AVOutputFormat *oformat, AudioEncoder *stream_audio_encoder, X264Encoder *x264_encoder);
         ~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);