Make current_frame_type non-global.

[nageru] / h264encode.h

diff --git a/h264encode.h b/h264encode.h
index 7a10d927ca84f94a7f8abc74fb7c6c7910b2e8d0..c87779738626a612149e23e75b5967f7ecb9ae75 100644 (file)
--- a/h264encode.h
+++ b/h264encode.h
@@ -27,9 +27,12 @@
 #define _H264ENCODE_H
 
 extern "C" {
+#include <libavcodec/avcodec.h>
 #include <libavformat/avformat.h>
 }
 #include <epoxy/gl.h>
+#include <stdbool.h>
+#include <stdint.h>
 #include <atomic>
 #include <condition_variable>
 #include <map>
@@ -78,11 +81,17 @@ 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_frame(PendingFrame frame, int encoding_frame_num, int frame_type, int64_t pts, int64_t dts);
        void storage_task_thread();
        void storage_task_enqueue(storage_task task);
-       int save_codeddata(storage_task task);
+       void save_codeddata(storage_task task);
 
        std::thread copy_thread, storage_thread;
 
@@ -100,11 +109,6 @@ private:
        //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;