X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=mux.h;h=47855f728ae82b5d09d9a180c0035fc59d770027;hb=ab03e5e6f24b1651b4ca7df95e20aa5786939209;hp=1dd967c40f2e7f3d379c168cf4485d10f18c2def;hpb=e1a58f0f4e9cd05441f1e1b43fc4c83d1f862dd7;p=nageru

diff --git a/mux.h b/mux.h
index 1dd967c..47855f7 100644
--- a/mux.h
+++ b/mux.h
@@ -10,6 +10,7 @@ extern "C" {
 }
 
 #include <mutex>
+#include <vector>
 
 class KeyFrameSignalReceiver {
 public:
@@ -25,13 +26,27 @@ public:
 	};
 
 	// Takes ownership of avctx. <keyframe_signal_receiver> can be nullptr.
-	Mux(AVFormatContext *avctx, int width, int height, Codec video_codec, const AVCodecContext *audio_ctx, int time_base, KeyFrameSignalReceiver *keyframe_signal_receiver);
+	Mux(AVFormatContext *avctx, int width, int height, Codec video_codec, const std::string &video_extradata, const AVCodecContext *audio_ctx, int time_base, KeyFrameSignalReceiver *keyframe_signal_receiver);
 	~Mux();
 	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:
-	std::mutex ctx_mu;
-	AVFormatContext *avctx;  // Protected by <ctx_mu>.
+	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;
 	KeyFrameSignalReceiver *keyframe_signal_receiver;
 };