X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=h264encode.h;h=748fa5170812f387c819208b2059dee819db89c5;hb=baf23298b4648b3e2ad708041834376a47a2db3e;hp=5662f05183608e061383fbe6633a2c9185ab696a;hpb=bc7862c72514f91de51c547b2efe26c90b9631f9;p=nageru

diff --git a/h264encode.h b/h264encode.h
index 5662f05..748fa51 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>
@@ -39,19 +42,20 @@ extern "C" {
 #include <thread>
 #include <vector>
 
-#include "bmusb.h"
+#include "bmusb/bmusb.h"
 #include "context.h"
 #include "pbo_frame_allocator.h"
 #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);
 
@@ -66,23 +70,31 @@ public:
 	};
 	void 
 #endif
+	void add_audio(int64_t pts, std::vector<float> audio);  // Needs to come before end_frame() of same pts.
 	bool begin_frame(GLuint *y_tex, GLuint *cbcr_tex);
-	void end_frame(RefCountedGLsync fence, int64_t pts, std::vector<float> audio, const std::vector<RefCountedFrame> &input_frames);
+	void end_frame(RefCountedGLsync fence, int64_t pts, const std::vector<RefCountedFrame> &input_frames);
 
 private:
 	struct storage_task {
 		unsigned long long display_order;
-		unsigned long long encode_order;
 		int frame_type;
 		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);
-	int save_codeddata(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;
@@ -92,24 +104,18 @@ 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;
-	};
 	std::map<int, PendingFrame> pending_video_frames;  // under frame_queue_mutex
-	std::map<int, std::vector<float>> pending_audio_frames;  // under frame_queue_mutex
-	std::map<int, int64_t> timestamps;  // under frame_queue_mutex
+	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