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

diff --git a/h264encode.h b/h264encode.h
index f355116..48dd329 100644
--- a/h264encode.h
+++ b/h264encode.h
@@ -29,25 +29,30 @@
 extern "C" {
 #include <libavformat/avformat.h>
 }
-#include <epoxy/egl.h>
+#include <epoxy/gl.h>
 #include <atomic>
+#include <condition_variable>
 #include <map>
 #include <memory>
 #include <mutex>
+#include <queue>
 #include <thread>
-#include <thread>
-#include <thread>
-#include <thread>
-#include <condition_variable>
+#include <vector>
 
-#include "pbo_frame_allocator.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, const char *output_filename, HTTPD *httpd);
 	~H264Encoder();
 	//void add_frame(FrameAllocator::Frame frame, GLsync fence);
 
@@ -62,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(GLsync fence);
+	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;
 
@@ -92,14 +99,20 @@ private:
 	//int frame_width, frame_height;
 	//int ;
 	int current_storage_frame;
-#if 0
-	std::map<int, std::pair<FrameAllocator::Frame, GLsync>> pending_frames;
-#endif
-	std::map<int, GLsync> pending_frames;
+
+	struct PendingFrame {
+		RefCountedGLsync fence;
+		std::vector<RefCountedFrame> input_frames;
+		int64_t pts;
+	};
+	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;
+	AVStream *avstream_video;
+	AVStream *avstream_audio;
+	HTTPD *httpd;
 };
 
 #endif