Support sending a separate x264 encode to disk.

[nageru] / nageru / quicksync_encoder_impl.h

diff --git a/nageru/quicksync_encoder_impl.h b/nageru/quicksync_encoder_impl.h
index 7645b99b6b34edf5e8afd83b91a6a9e7f981ba10..c4a99fb97f8874b24e0362d9469bafc92792a678 100644 (file)
--- a/nageru/quicksync_encoder_impl.h
+++ b/nageru/quicksync_encoder_impl.h
@@ -17,9 +17,11 @@
 
 #include "audio_encoder.h"
 #include "defs.h"
-#include "timebase.h"
+#include "shared/timebase.h"
 #include "print_latency.h"
-#include "ref_counted_gl_sync.h"
+#include "shared/ref_counted_gl_sync.h"
+#include "shared/va_display.h"
+#include "v4l_output.h"
 
 #define SURFACE_NUM 16 /* 16 surfaces for source YUV */
 #define MAX_NUM_REF1 16 // Seemingly a hardware-fixed value, not related to SURFACE_NUM
@@ -39,19 +41,9 @@ class DiskSpaceEstimator;
 class QSurface;
 class X264Encoder;
 
-struct VADisplayWithCleanup {
-       ~VADisplayWithCleanup();
-
-       VADisplay va_dpy;
-       Display *x11_display = nullptr;
-       bool can_use_zerocopy = true;
-       int drm_fd = -1;
-};
-std::unique_ptr<VADisplayWithCleanup> va_open_display(const std::string &va_display);  // Can return nullptr on failure.
-
 class QuickSyncEncoderImpl {
 public:
-       QuickSyncEncoderImpl(const std::string &filename, movit::ResourcePool *resource_pool, QSurface *surface, const std::string &va_display, int width, int height, AVOutputFormat *oformat, X264Encoder *x264_encoder, DiskSpaceEstimator *disk_space_estimator);
+       QuickSyncEncoderImpl(const std::string &filename, movit::ResourcePool *resource_pool, QSurface *surface, const std::string &va_display, int width, int height, AVOutputFormat *oformat, X264Encoder *http_encoder, X264Encoder *disk_encoder, DiskSpaceEstimator *disk_space_estimator);
        ~QuickSyncEncoderImpl();
        void add_audio(int64_t pts, std::vector<float> audio);
        bool is_zerocopy() const;
@@ -179,7 +171,9 @@ private:
        std::mutex file_audio_encoder_mutex;
        std::unique_ptr<AudioEncoder> file_audio_encoder;
 
-       X264Encoder *x264_encoder;  // nullptr if not using x264.
+       X264Encoder *x264_http_encoder;  // nullptr if not using x264.
+       X264Encoder *x264_disk_encoder;
+       std::unique_ptr<V4LOutput> v4l_output;  // nullptr if not using V4L2 output.
 
        Mux* stream_mux = nullptr;  // To HTTP.
        std::unique_ptr<Mux> file_mux;  // To local disk.