X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=quicksync_encoder.h;h=110d615ed05e846b85aae14ad4422a64166092f2;hb=6ffaabac0a523617b686f40c154a25cb548cc561;hp=f4e9e0b57e37c890b44536a24e86babd9d2dd558;hpb=2abf57fbc06f52c04fb2ca1f765459908e688890;p=nageru

diff --git a/quicksync_encoder.h b/quicksync_encoder.h
index f4e9e0b..110d615 100644
--- a/quicksync_encoder.h
+++ b/quicksync_encoder.h
@@ -59,14 +59,16 @@ class ResourcePool;
 // This is just a pimpl, because including anything X11-related in a .h file
 // tends to trip up Qt. All the real logic is in QuickSyncEncoderImpl,
 // defined in quicksync_encoder_impl.h.
+//
+// This class is _not_ thread-safe, except where mentioned.
 class QuickSyncEncoder {
 public:
         QuickSyncEncoder(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);
         ~QuickSyncEncoder();
 
 	void set_stream_mux(Mux *mux);  // Does not take ownership. Must be called unless x264 is used for the stream.
-	void add_audio(int64_t pts, std::vector<float> audio);
-	bool is_zerocopy() const;
+	void add_audio(int64_t pts, std::vector<float> audio);  // Thread-safe.
+	bool is_zerocopy() const;  // Thread-safe.
 
 	// See VideoEncoder::begin_frame().
 	bool begin_frame(int64_t pts, int64_t duration, movit::YCbCrLumaCoefficients ycbcr_coefficients, const std::vector<RefCountedFrame> &input_frames, GLuint *y_tex, GLuint *cbcr_tex);
@@ -76,6 +78,11 @@ public:
 	void release_gl_resources();  // Requires an OpenGL context. Must be run after shutdown.
 	int64_t global_delay() const;  // So we never get negative dts.
 
+	// Tries to autodetect a device with a usable VA-API H.264 encoder.
+	// Tries first the default X11 display, then every /dev/dri/renderD* node in turn.
+	// Dies if none could be found.
+	static std::string get_usable_va_display();
+
 private:
 	std::unique_ptr<QuickSyncEncoderImpl> impl;
 };