X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=h264encode.h;h=7a10d927ca84f94a7f8abc74fb7c6c7910b2e8d0;hb=4ec330853ee13b230f089253fedd20b49229e42b;hp=9525d802c8875a8908e30dfa319b246087ac825c;hpb=6796837c2e3e08de8d530be233317a2fc4a43f72;p=nageru

diff --git a/h264encode.h b/h264encode.h
index 9525d80..7a10d92 100644
--- a/h264encode.h
+++ b/h264encode.h
@@ -39,19 +39,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,20 +67,22 @@ 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, 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;
 	};
 
 	void copy_thread_func();
 	void storage_task_thread();
-	void storage_task_enqueue(unsigned long long display_order, unsigned long long encode_order, int frame_type);
-	int save_codeddata(unsigned long long display_order, unsigned long long encode_order, int frame_type);
+	void storage_task_enqueue(storage_task task);
+	int save_codeddata(storage_task task);
 
 	std::thread copy_thread, storage_thread;
 
@@ -100,12 +103,14 @@ private:
 	struct PendingFrame {
 		RefCountedGLsync fence;
 		std::vector<RefCountedFrame> input_frames;
+		int64_t pts;
 	};
-	std::map<int, PendingFrame> pending_frames;
+	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;
 
-	AVFormatContext *avctx;
-	AVStream *avstream;
+	AVCodecContext *context_audio;
+	HTTPD *httpd;
 };
 
 #endif