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

diff --git a/h264encode.h b/h264encode.h
index 9525d80..ec49fb7 100644
--- a/h264encode.h
+++ b/h264encode.h
@@ -39,7 +39,7 @@ 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"
@@ -66,20 +66,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;
 	};
 
 	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;
 
@@ -101,11 +103,14 @@ private:
 		RefCountedGLsync fence;
 		std::vector<RefCountedFrame> input_frames;
 	};
-	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
+	std::map<int, int64_t> timestamps;  // under frame_queue_mutex
 	QSurface *surface;
 
 	AVFormatContext *avctx;
-	AVStream *avstream;
+	AVStream *avstream_video;
+	AVStream *avstream_audio;
 };
 
 #endif