More H.264 shutdown fixes.

[nageru] / h264encode.h

diff --git a/h264encode.h b/h264encode.h
index b6f783746777680644ff72eb5ddf75d30f35e552..748fa5170812f387c819208b2059dee819db89c5 100644 (file)
--- a/h264encode.h
+++ b/h264encode.h
@@ -81,13 +81,20 @@ private:
                std::vector<float> audio;
                int64_t pts, dts;
        };
+       struct PendingFrame {
+               RefCountedGLsync fence;
+               std::vector<RefCountedFrame> input_frames;
+               int64_t pts;
+       };
 
-       void copy_thread_func();
+       void encode_thread_func();
+       void encode_frame(PendingFrame frame, int encoding_frame_num, int display_frame_num, int gop_start_display_frame_num,
+                         int frame_type, int64_t pts, int64_t dts);
        void storage_task_thread();
        void storage_task_enqueue(storage_task task);
        void save_codeddata(storage_task task);
 
-       std::thread copy_thread, storage_thread;
+       std::thread encode_thread, storage_thread;
 
        std::mutex storage_task_queue_mutex;
        std::condition_variable storage_task_queue_changed;
@@ -97,17 +104,12 @@ private:
 
        std::mutex frame_queue_mutex;
        std::condition_variable frame_queue_nonempty;
-       bool copy_thread_should_quit = false;  // under frame_queue_mutex
+       bool encode_thread_should_quit = false;  // under frame_queue_mutex
 
        //int frame_width, frame_height;
        //int ;
        int current_storage_frame;
 
-       struct PendingFrame {
-               RefCountedGLsync fence;
-               std::vector<RefCountedFrame> input_frames;
-               int64_t pts;
-       };
        std::map<int, PendingFrame> pending_video_frames;  // under frame_queue_mutex
        std::map<int64_t, std::vector<float>> pending_audio_frames;  // under frame_queue_mutex
        QSurface *surface;