X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=h264encode.h;h=748fa5170812f387c819208b2059dee819db89c5;hb=cc8c88d231b1cde40baac3c2a780b89c69b96175;hp=520a168be0e0ae11b96c410e93834eb09270dce0;hpb=408b03dbd380f3b2ea89fc20915c38bd4e4b9750;p=nageru diff --git a/h264encode.h b/h264encode.h index 520a168..748fa51 100644 --- a/h264encode.h +++ b/h264encode.h @@ -87,13 +87,14 @@ private: int64_t pts; }; - void copy_thread_func(); - void encode_frame(PendingFrame frame, int64_t pts, int64_t dts); + 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; @@ -103,7 +104,7 @@ 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 ;