If a dead device comes back, put it into the right slot.

[nageru] / quicksync_encoder.h

diff --git a/quicksync_encoder.h b/quicksync_encoder.h
index 4f2bca5a3236e73fa6a3e12742922bed80cf2076..16fd3d179cd048a2d6b29e447d3209a673ecebca 100644 (file)
--- a/quicksync_encoder.h
+++ b/quicksync_encoder.h
@@ -27,19 +27,27 @@
 #define _H264ENCODE_H
 
 #include <epoxy/gl.h>
+#include <stdbool.h>
 #include <stdint.h>
 #include <atomic>
+#include <functional>
 #include <memory>
 #include <string>
 #include <vector>
 
+extern "C" {
+#include <libavformat/avformat.h>
+}
+
 #include "ref_counted_frame.h"
 #include "ref_counted_gl_sync.h"
 
 class AudioEncoder;
+class DiskSpaceEstimator;
 class Mux;
-class QuickSyncEncoderImpl;
 class QSurface;
+class QuickSyncEncoderImpl;
+class RefCountedFrame;
 class X264Encoder;
 
 namespace movit {
@@ -51,13 +59,16 @@ class ResourcePool;
 // .cpp file.
 class QuickSyncEncoder {
 public:
-        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(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);
-       void shutdown();  // Blocking.
+       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.
 
 private:
        std::unique_ptr<QuickSyncEncoderImpl> impl;