Add a wrapper to make fences refcounted, as we will soon be needing to split them...

[nageru] / h264encode.cpp

diff --git a/h264encode.cpp b/h264encode.cpp
index 33057a890359e4abd98e3bd2341b527f6be55cb8..83de3bd32c61ffe30687c234775db5299801b7c1 100644 (file)
--- a/h264encode.cpp
+++ b/h264encode.cpp
@@ -1740,10 +1740,9 @@ H264Encoder::H264Encoder(QSurface *surface, int width, int height, const char *o
                fprintf(stderr, "%s: avformat_new_stream() failed\n", output_filename);
                exit(1);
        }
-       avstream->time_base = AVRational{1, frame_rate};  // TODO
+       avstream->time_base = AVRational{1, frame_rate};
        avstream->codec->width = width;
        avstream->codec->height = height;
-       //avstream->codec->time_base = AVRational{1, 60};  // TODO
        avstream->codec->time_base = AVRational{1, frame_rate};
        avstream->codec->ticks_per_frame = 1;  // or 2?
 
@@ -1875,7 +1874,7 @@ bool H264Encoder::begin_frame(GLuint *y_tex, GLuint *cbcr_tex)
        return true;
 }
 
-void H264Encoder::end_frame(GLsync fence, const std::vector<FrameAllocator::Frame> &input_frames_to_release)
+void H264Encoder::end_frame(RefCountedGLsync fence, const std::vector<FrameAllocator::Frame> &input_frames_to_release)
 {
        {
                unique_lock<mutex> lock(frame_queue_mutex);
@@ -1905,8 +1904,7 @@ void H264Encoder::copy_thread_func()
                }
 
                // Wait for the GPU to be done with the frame.
-               glClientWaitSync(frame.fence, 0, 0);
-               glDeleteSync(frame.fence);
+               glClientWaitSync(frame.fence.get(), 0, 0);
 
                // Release back any input frames we needed to render this frame.
                // (Actually, those that were needed one output frame ago.)