X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=h264encode.h;h=caf33af0c8de3d2c72af8e56dcf8d57f60ef3eb0;hb=a9313d3eb914641cbdf8f2426d1fa79b45b55107;hp=1e6b110bec34056610e691791c2460a71fed72f7;hpb=22f28b66a6a70f722eb09cd25e200082d7be77e4;p=nageru

diff --git a/h264encode.h b/h264encode.h
index 1e6b110..caf33af 100644
--- a/h264encode.h
+++ b/h264encode.h
@@ -26,89 +26,33 @@
 #ifndef _H264ENCODE_H
 #define _H264ENCODE_H
 
-extern "C" {
-#include <libavformat/avformat.h>
-}
 #include <epoxy/gl.h>
+#include <stdint.h>
 #include <atomic>
-#include <condition_variable>
-#include <map>
 #include <memory>
-#include <mutex>
-#include <queue>
-#include <thread>
 #include <vector>
 
-#include "bmusb.h"
-#include "context.h"
-#include "pbo_frame_allocator.h"
 #include "ref_counted_frame.h"
 #include "ref_counted_gl_sync.h"
 
+class H264EncoderImpl;
+class HTTPD;
 class QSurface;
 
-#define SURFACE_NUM 16 /* 16 surfaces for source YUV */
-
+// This is just a pimpl, because including anything X11-related in a .h file
+// tends to trip up Qt. All the real logic is in H264EncoderImpl, defined in the
+// .cpp file.
 class H264Encoder {
 public:
-	H264Encoder(QSurface *surface, int width, int height, const char *output_filename);
-	~H264Encoder();
-	//void add_frame(FrameAllocator::Frame frame, GLsync fence);
-
-#if 0
-	struct Frame {
-	public:
-		GLuint fbo;
-		GLuint y_tex, cbcr_tex;	
+        H264Encoder(QSurface *surface, int width, int height, HTTPD *httpd);
+        ~H264Encoder();
 
-	private:
-		//int surface_subnum;
-	};
-	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, 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;
-	};
-
-	void copy_thread_func();
-	void storage_task_thread();
-	void storage_task_enqueue(storage_task task);
-	int save_codeddata(storage_task task);
-
-	std::thread copy_thread, storage_thread;
-
-	std::mutex storage_task_queue_mutex;
-	std::condition_variable storage_task_queue_changed;
-	int srcsurface_status[SURFACE_NUM];  // protected by storage_task_queue_mutex
-	std::queue<storage_task> storage_task_queue;  // protected by storage_task_queue_mutex
-	bool storage_thread_should_quit = false;  // protected by storage_task_queue_mutex
-
-	std::mutex frame_queue_mutex;
-	std::condition_variable frame_queue_nonempty;
-	bool copy_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;
-	std::map<int, std::vector<float>> pending_audio_frames;
-	QSurface *surface;
-
-	AVFormatContext *avctx;
-	AVStream *avstream_video;
-	AVStream *avstream_audio;
+	std::unique_ptr<H264EncoderImpl> impl;
 };
 
 #endif