Re-run IWYU, again with lots of manual cleanup.

[nageru] / h264encode.h

diff --git a/h264encode.h b/h264encode.h
index e4ef1aba01377788a980749dae3ba2b07fef8e79..2bbbed50f57069dfe4249eb0c31713d3d2d38cdc 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>
@@ -45,13 +48,14 @@ extern "C" {
 #include "ref_counted_frame.h"
 #include "ref_counted_gl_sync.h"
 
+class HTTPD;
 class QSurface;
 
 #define SURFACE_NUM 16 /* 16 surfaces for source YUV */
 
 class H264Encoder {
 public:
-       H264Encoder(QSurface *surface, int width, int height, const char *output_filename);
+       H264Encoder(QSurface *surface, int width, int height, HTTPD *httpd);
        ~H264Encoder();
        //void add_frame(FrameAllocator::Frame frame, GLsync fence);
 
@@ -108,9 +112,8 @@ private:
        std::map<int64_t, std::vector<float>> pending_audio_frames;  // under frame_queue_mutex
        QSurface *surface;
 
-       AVFormatContext *avctx;
-       AVStream *avstream_video;
-       AVStream *avstream_audio;
+       AVCodecContext *context_audio;
+       HTTPD *httpd;
 };
 
 #endif