Merge branch 'mjpeg'

[nageru] / nageru / quicksync_encoder_impl.h

diff --git a/nageru/quicksync_encoder_impl.h b/nageru/quicksync_encoder_impl.h
index e0da15d848e3cbf615aa85d0e1af2c09f1e759fc..5e215e5b691bfa3f81ff317ce58404415c8d4c3d 100644 (file)
--- a/nageru/quicksync_encoder_impl.h
+++ b/nageru/quicksync_encoder_impl.h
@@ -20,6 +20,7 @@
 #include "shared/timebase.h"
 #include "print_latency.h"
 #include "shared/ref_counted_gl_sync.h"
+#include "va_display_with_cleanup.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,16 +40,6 @@ 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);