Fix a few Clang warnings.

[nageru] / quicksync_encoder.h

diff --git a/quicksync_encoder.h b/quicksync_encoder.h
index 16fd3d179cd048a2d6b29e447d3209a673ecebca..de243ac6f2a3f28e98a9a30ae090a90b35332a67 100644 (file)
--- 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.
 //
@@ -27,10 +32,9 @@
 #define _H264ENCODE_H
 
 #include <epoxy/gl.h>
+#include <movit/image_format.h>
 #include <stdbool.h>
 #include <stdint.h>
-#include <atomic>
-#include <functional>
 #include <memory>
 #include <string>
 #include <vector>
@@ -39,10 +43,8 @@ extern "C" {
 #include <libavformat/avformat.h>
 }
 
-#include "ref_counted_frame.h"
 #include "ref_counted_gl_sync.h"
 
-class AudioEncoder;
 class DiskSpaceEstimator;
 class Mux;
 class QSurface;
@@ -55,18 +57,24 @@ class ResourcePool;
 }  // namespace movit
 
 // 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 the
-// .cpp 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 begin_frame(GLuint *y_tex, GLuint *cbcr_tex);
-       RefCountedGLsync end_frame(int64_t pts, int64_t duration, const std::vector<RefCountedFrame> &input_frames);
+       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.