Set x264 global headers (Quick Sync global headers are still not there).

[nageru] / video_encoder.h

diff --git a/video_encoder.h b/video_encoder.h
index 1a5c97d0310525a49873a6a9900e7ab4e5eba720..78162e9c91badb1f18273d7b27ee0f430c3734da 100644 (file)
--- a/video_encoder.h
+++ b/video_encoder.h
@@ -10,16 +10,23 @@
 #include <string>
 #include <vector>
 
+#include "audio_encoder.h"
+#include "mux.h"
 #include "ref_counted_frame.h"
 #include "ref_counted_gl_sync.h"
 
 class HTTPD;
 class QSurface;
 class QuickSyncEncoder;
+class X264Encoder;
 
-class VideoEncoder {
+namespace movit {
+class ResourcePool;
+}  // namespace movit
+
+class VideoEncoder : public KeyFrameSignalReceiver {
 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);
        ~VideoEncoder();
 
        void add_audio(int64_t pts, std::vector<float> audio);
@@ -29,12 +36,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;
+       }
+
 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);
+
+       AVOutputFormat *oformat;
        std::unique_ptr<QuickSyncEncoder> quicksync_encoder;
+       movit::ResourcePool *resource_pool;
        QSurface *surface;
        std::string va_display;
        int width, height;
        HTTPD *httpd;
+
+       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;
 };
 
 #endif