X-Git-Url: https://git.sesse.net/?p=nageru;a=blobdiff_plain;f=mux.h;h=ddf97fe92a591d86ec6dbebd9614cf32fa9a0846;hp=2eb8eeaa45f1472f471488736b9638ce382b2407;hb=refs%2Fheads%2Fmultichannel_audio;hpb=8348925c4cb0d7a73b07db03c6bc6d55fa0631b8

diff --git a/mux.h b/mux.h
index 2eb8eea..ddf97fe 100644
--- a/mux.h
+++ b/mux.h
@@ -6,14 +6,13 @@
 extern "C" {
 #include <libavcodec/avcodec.h>
 #include <libavformat/avformat.h>
-#include <libavformat/avio.h>
 }
 
-class KeyFrameSignalReceiver {
-public:
-	// Needs to automatically turn the flag off again after actually receiving data.
-	virtual void signal_keyframe() = 0;
-};
+#include <sys/types.h>
+#include <functional>
+#include <mutex>
+#include <string>
+#include <vector>
 
 class Mux {
 public:
@@ -22,15 +21,35 @@ public:
 		CODEC_NV12,  // Uncompressed 4:2:0.
 	};
 
-	// Takes ownership of avctx. <keyframe_signal_receiver> can be nullptr.
-	Mux(AVFormatContext *avctx, int width, int height, Codec video_codec, const AVCodec *codec_audio, int time_base, int bit_rate, KeyFrameSignalReceiver *keyframe_signal_receiver);
+	// 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);
 
+	// 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:
-	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;
-	KeyFrameSignalReceiver *keyframe_signal_receiver;
+
+	std::function<void(int64_t)> write_callback;
 };
 
 #endif  // !defined(_MUX_H)