Add a CORS policy to the channel endpoints, so that external applications can query...

[nageru] / quicksync_encoder_impl.h

diff --git a/quicksync_encoder_impl.h b/quicksync_encoder_impl.h
index 679f2a27beec9753e2e1cffb0767a7db4e0fd667..bc84e0adc7280beadb9e11ad1ee278eec59ac1ec 100644 (file)
--- a/quicksync_encoder_impl.h
+++ b/quicksync_encoder_impl.h
@@ -36,9 +36,11 @@ 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);
        ~QuickSyncEncoderImpl();
        void add_audio(int64_t pts, std::vector<float> audio);
+       bool is_zerocopy() const;
        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();
+       void close_file();
        void release_gl_resources();
        void set_stream_mux(Mux *mux)
        {
@@ -67,13 +69,13 @@ private:
                movit::YCbCrLumaCoefficients ycbcr_coefficients;
        };
        struct GLSurface {
+               // Only if x264_video_to_disk == false.
                VASurfaceID src_surface, ref_surface;
                VABufferID coded_buf;
-
                VAImage surface_image;
-               GLuint y_tex, cbcr_tex;
 
-               // Only if use_zerocopy == true.
+               // Only if use_zerocopy == true (which implies x264_video_to_disk == false).
+               GLuint y_tex, cbcr_tex;
                EGLImage y_egl_image, cbcr_egl_image;
 
                // Only if use_zerocopy == false.
@@ -133,7 +135,7 @@ private:
 
        bool is_shutdown = false;
        bool has_released_gl_resources = false;
-       bool use_zerocopy;
+       std::atomic<bool> use_zerocopy;
        int drm_fd = -1;
 
        std::thread encode_thread, storage_thread;
@@ -160,6 +162,7 @@ private:
        std::map<int, PendingFrame> reorder_buffer;
        int quicksync_encoding_frame_num = 0;
 
+       std::mutex file_audio_encoder_mutex;
        std::unique_ptr<AudioEncoder> file_audio_encoder;
 
        X264Encoder *x264_encoder;  // nullptr if not using x264.