X-Git-Url: https://git.sesse.net/?p=nageru;a=blobdiff_plain;f=quicksync_encoder_impl.h;h=0317b6af0393723bb1ca38ac0100947d8c800c85;hp=7645b99b6b34edf5e8afd83b91a6a9e7f981ba10;hb=817fffe1ef3bd87f2387395f49487cf5255d8daf;hpb=330ca2f0052b06d91004c6ceb73cd57ab95e7fe1 diff --git a/quicksync_encoder_impl.h b/quicksync_encoder_impl.h index 7645b99..0317b6a 100644 --- a/quicksync_encoder_impl.h +++ b/quicksync_encoder_impl.h @@ -20,6 +20,7 @@ #include "timebase.h" #include "print_latency.h" #include "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 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);