X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=quicksync_encoder.h;h=de243ac6f2a3f28e98a9a30ae090a90b35332a67;hb=4a0187ffb4075b4d217b8d9e9c96cac548b199d8;hp=a247ee80fe6bf8b6bfc1890601d85ecccd1113b2;hpb=ee7da87b4aa284b7babd59dc21db925f7c384ce7;p=nageru

diff --git a/quicksync_encoder.h b/quicksync_encoder.h
index a247ee8..de243ac 100644
--- a/quicksync_encoder.h
+++ b/quicksync_encoder.h
@@ -1,5 +1,10 @@
-// Hardware H.264 encoding via VAAPI. Heavily modified based on example
-// code by Intel. Intel's original copyright and license is reproduced below:
+// Hardware H.264 encoding via VAAPI. Also orchestrates the H.264 encoding
+// in general; this is unfortunate, and probably needs a cleanup. In particular,
+// even if you don't actually use Quick Sync for anything, this class
+// (or actually, QuickSyncEncoderImpl) still takes on a pretty central role.
+//
+// Heavily modified based on example code by Intel. Intel's original copyright
+// and license is reproduced below:
 //
 // Copyright (c) 2007-2013 Intel Corporation. All Rights Reserved.
 //
@@ -54,16 +59,22 @@ 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);
+	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);
 	RefCountedGLsync end_frame();
 	void shutdown();  // Blocking. Does not require an OpenGL context.
+	void close_file();  // Does not require an OpenGL context. Must be run after shutdown.
 	void release_gl_resources();  // Requires an OpenGL context. Must be run after shutdown.
 	int64_t global_delay() const;  // So we never get negative dts.