Write 1.4.0 changelog.

[nageru] / video_encoder.h

diff --git a/video_encoder.h b/video_encoder.h
index fd16ac82f66584cc1f5a76eb783bf954b3a056d9..0991f91195330a4f32409c9ed047f22455cb922e 100644 (file)
--- a/video_encoder.h
+++ b/video_encoder.h
@@ -5,20 +5,29 @@
 #ifndef _VIDEO_ENCODER_H
 #define _VIDEO_ENCODER_H
 
+#include <epoxy/gl.h>
+#include <stdbool.h>
 #include <stdint.h>
+#include <atomic>
 #include <memory>
-#include <set>
+#include <mutex>
 #include <string>
 #include <vector>
 
-#include "audio_encoder.h"
-#include "mux.h"
-#include "ref_counted_frame.h"
+extern "C" {
+#include <libavformat/avformat.h>
+#include <libavformat/avio.h>
+}
+
 #include "ref_counted_gl_sync.h"
 
+class AudioEncoder;
+class DiskSpaceEstimator;
 class HTTPD;
+class Mux;
 class QSurface;
 class QuickSyncEncoder;
+class RefCountedFrame;
 class X264Encoder;
 
 namespace movit {
@@ -27,7 +36,7 @@ class ResourcePool;
 
 class VideoEncoder {
 public:
-       VideoEncoder(movit::ResourcePool *resource_pool, QSurface *surface, const std::string &va_display, int width, int height, HTTPD *httpd);
+       VideoEncoder(movit::ResourcePool *resource_pool, QSurface *surface, const std::string &va_display, int width, int height, HTTPD *httpd, DiskSpaceEstimator *disk_space_estimator);
        ~VideoEncoder();
 
        void add_audio(int64_t pts, std::vector<float> audio);
@@ -52,6 +61,7 @@ private:
        std::string va_display;
        int width, height;
        HTTPD *httpd;
+       DiskSpaceEstimator *disk_space_estimator;
 
        std::unique_ptr<Mux> stream_mux;  // To HTTP.
        std::unique_ptr<AudioEncoder> stream_audio_encoder;