Move X264Encoder out of QuickSyncEncoder. This completes independent restart of the...

[nageru] / video_encoder.h

diff --git a/video_encoder.h b/video_encoder.h
index bf203f1438cbc2b1a2138fb1764fc576fa8b93c7..81c48992f8c7620289e83abc458dd6e7ddbaf2ad 100644 (file)
--- a/video_encoder.h
+++ b/video_encoder.h
@@ -18,6 +18,7 @@
 class HTTPD;
 class QSurface;
 class QuickSyncEncoder;
+class X264Encoder;
 
 class VideoEncoder : public KeyFrameSignalReceiver {
 public:
@@ -49,6 +50,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.