Some random #include fixing.

[nageru] / nageru / x264_encoder.h

diff --git a/nageru/x264_encoder.h b/nageru/x264_encoder.h
index 7b8751715250d5f34147f7f11d9a8d83df409037..d767ac3942c5db5d2212bf7a49b8abdb70294867 100644 (file)
--- a/nageru/x264_encoder.h
+++ b/nageru/x264_encoder.h
@@ -35,27 +35,28 @@ extern "C" {
 #include "defs.h"
 #include "shared/metrics.h"
 #include "print_latency.h"
+#include "video_codec_interface.h"
 #include "x264_dynamic.h"
 
 class Mux;
 class X264SpeedControl;
 
-class X264Encoder {
+class X264Encoder : public VideoCodecInterface {
 public:
-       X264Encoder(AVOutputFormat *oformat);  // Does not take ownership.
+       X264Encoder(const AVOutputFormat *oformat, bool use_separate_disk_params);  // Does not take ownership.
 
        // Called after the last frame. Will block; once this returns,
        // the last data is flushed.
-       ~X264Encoder();
+       ~X264Encoder() override;
 
        // Must be called before first frame. Does not take ownership.
-       void add_mux(Mux *mux) { muxes.push_back(mux); }
+       void add_mux(Mux *mux) override { muxes.push_back(mux); }
 
        // <data> is taken to be raw NV12 data of WIDTHxHEIGHT resolution.
        // Does not block.
-       void add_frame(int64_t pts, int64_t duration, movit::YCbCrLumaCoefficients ycbcr_coefficients, const uint8_t *data, const ReceivedTimestamps &received_ts);
+       void add_frame(int64_t pts, int64_t duration, movit::YCbCrLumaCoefficients ycbcr_coefficients, const uint8_t *data, const ReceivedTimestamps &received_ts) override;
 
-       std::string get_global_headers() const {
+       std::string get_global_headers() const override {
                while (!x264_init_done) {
                        sched_yield();
                }
@@ -86,7 +87,8 @@ private:
        std::unique_ptr<uint8_t[]> frame_pool;
 
        std::vector<Mux *> muxes;
-       bool wants_global_headers;
+       const bool wants_global_headers;
+       const bool use_separate_disk_params;
 
        std::string global_headers;
        std::string buffered_sei;  // Will be output before first frame, if any.