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 bf203f1438cbc2b1a2138fb1764fc576fa8b93c7..78162e9c91badb1f18273d7b27ee0f430c3734da 100644 (file)
--- a/video_encoder.h
+++ b/video_encoder.h
@@ -18,10 +18,15 @@
 class HTTPD;
 class QSurface;
 class QuickSyncEncoder;
+class X264Encoder;
+
+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);
@@ -41,7 +46,9 @@ private:
        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;
@@ -49,6 +56,7 @@ private:
 
        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.