X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=h264encode.h;h=b6f783746777680644ff72eb5ddf75d30f35e552;hb=5e01b03ee7850241a15f74e160ebbe2b8ad9b9ea;hp=48dd3291df457b1c2b8dbb7f3cdf6c380b848cc6;hpb=b4f16ea9f8969a3ba14be8cd9c88cfe00d19533b;p=nageru

diff --git a/h264encode.h b/h264encode.h
index 48dd329..b6f7837 100644
--- 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>
@@ -52,7 +55,7 @@ class QSurface;
 
 class H264Encoder {
 public:
-	H264Encoder(QSurface *surface, int width, int height, const char *output_filename, HTTPD *httpd);
+	H264Encoder(QSurface *surface, int width, int height, HTTPD *httpd);
 	~H264Encoder();
 	//void add_frame(FrameAllocator::Frame frame, GLsync fence);
 
@@ -82,7 +85,7 @@ private:
 	void copy_thread_func();
 	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;
 
@@ -109,9 +112,7 @@ 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;
 };