X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=mux.h;h=3f5007db9f75c6040415be1a01ce6ccd74059db0;hb=379449a2d9d8f75cf7e37302ebe6b54e373bc2e4;hp=47ff775d8cdf2d0faa2148ae1b55100d2bbcd8b1;hpb=acc9fe1e6be3e7b1c95f44e45728ec3beae576b0;p=nageru

diff --git a/mux.h b/mux.h
index 47ff775..3f5007d 100644
--- a/mux.h
+++ b/mux.h
@@ -9,28 +9,47 @@ extern "C" {
 #include <libavformat/avio.h>
 }
 
-class PacketDestination {
-public:
-	virtual ~PacketDestination() {}
-	virtual void add_packet(const AVPacket &pkt, int64_t pts, int64_t dts) = 0;
-};
+#include <functional>
+#include <mutex>
+#include <queue>
+#include <vector>
 
-class Mux : public PacketDestination {
+class Mux {
 public:
 	enum Codec {
 		CODEC_H264,
 		CODEC_NV12,  // Uncompressed 4:2:0.
 	};
 
-	// Takes ownership of avctx.
-	Mux(AVFormatContext *avctx, int width, int height, Codec video_codec, const AVCodec *codec_audio, int time_base, int bit_rate);
+	// Takes ownership of avctx. <write_callback> will be called every time
+	// a write has been made to the video stream (id 0), with the pts of
+	// the just-written frame. (write_callback can be nullptr.)
+	Mux(AVFormatContext *avctx, int width, int height, Codec video_codec, const std::string &video_extradata, const AVCodecParameters *audio_codecpar, int time_base, std::function<void(int64_t)> write_callback);
 	~Mux();
-	void add_packet(const AVPacket &pkt, int64_t pts, int64_t dts) override;
+	void add_packet(const AVPacket &pkt, int64_t pts, int64_t dts);
+
+	// As long as the mux is plugged, it will not actually write anything to disk,
+	// just queue the packets. Once it is unplugged, the packets are reordered by pts
+	// and written. This is primarily useful if you might have two different encoders
+	// writing to the mux at the same time (because one is shutting down), so that
+	// pts might otherwise come out-of-order.
+	//
+	// You can plug and unplug multiple times; only when the plug count reaches zero,
+	// something will actually happen.
+	void plug();
+	void unplug();
 
 private:
-	bool seen_keyframe = false;
-	AVFormatContext *avctx;
+	void write_packet_or_die(const AVPacket &pkt);  // Must be called with <mu> held.
+
+	std::mutex mu;
+	AVFormatContext *avctx;  // Protected by <mu>.
+	int plug_count = 0;  // Protected by <mu>.
+	std::vector<AVPacket *> plugged_packets;  // Protected by <mu>.
+
 	AVStream *avstream_video, *avstream_audio;
+
+	std::function<void(int64_t)> write_callback;
 };
 
 #endif  // !defined(_MUX_H)