Make it possible to load/save input mappings.

[nageru] / video_encoder.h

diff --git a/video_encoder.h b/video_encoder.h
index 81c48992f8c7620289e83abc458dd6e7ddbaf2ad..9a9f861839e1834f3b2228c492527731928f3242 100644 (file)
--- a/video_encoder.h
+++ b/video_encoder.h
@@ -7,6 +7,7 @@
 
 #include <stdint.h>
 #include <memory>
+#include <set>
 #include <string>
 #include <vector>
 
@@ -15,14 +16,19 @@
 #include "ref_counted_frame.h"
 #include "ref_counted_gl_sync.h"
 
+class DiskSpaceEstimator;
 class HTTPD;
 class QSurface;
 class QuickSyncEncoder;
 class X264Encoder;
 
-class VideoEncoder : public KeyFrameSignalReceiver {
+namespace movit {
+class ResourcePool;
+}  // namespace movit
+
+class VideoEncoder {
 public:
-       VideoEncoder(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);
@@ -32,32 +38,34 @@ public:
        // Does a cut of the disk stream immediately ("frame" is used for the filename only).
        void do_cut(int frame);
 
-       virtual void signal_keyframe() override {
-               stream_mux_writing_keyframes = true;
-       }
+       void change_x264_bitrate(unsigned rate_kbit);
 
 private:
        void open_output_stream();
-       void close_output_stream();
-       static int write_packet_thunk(void *opaque, uint8_t *buf, int buf_size);
-       int write_packet(uint8_t *buf, int buf_size);
+       static int write_packet2_thunk(void *opaque, uint8_t *buf, int buf_size, AVIODataMarkerType type, int64_t time);
+       int write_packet2(uint8_t *buf, int buf_size, AVIODataMarkerType type, int64_t time);
 
-       std::unique_ptr<QuickSyncEncoder> quicksync_encoder;
+       AVOutputFormat *oformat;
+       std::mutex qs_mu;
+       std::unique_ptr<QuickSyncEncoder> quicksync_encoder;  // Under <qs_mu>.
+       movit::ResourcePool *resource_pool;
        QSurface *surface;
        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;
        std::unique_ptr<X264Encoder> x264_encoder;  // nullptr if not using x264.
 
-       // While Mux object is constructing, <stream_mux_writing_header> is true,
-       // and the header is being collected into stream_mux_header.
-       bool stream_mux_writing_header;
        std::string stream_mux_header;
 
-       bool stream_mux_writing_keyframes = false;
+       std::atomic<int> quicksync_encoders_in_shutdown{0};
+
+       // Encoders that are shutdown, but need to call release_gl_resources()
+       // (or be deleted) from some thread with an OpenGL context.
+       std::vector<std::unique_ptr<QuickSyncEncoder>> qs_needing_cleanup;  // Under <qs_mu>.
 };
 
 #endif