X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=mux.h;h=c6c442100c58b18c481754747693b54c8571bcbc;hb=525665b0f6639686dad77785e81f31a5a9d87bc8;hp=45eab34a3d12390ed69e1367b798f5383cced118;hpb=db03cd080a4b38d76b85d3acf88a1bac0e84e734;p=nageru

diff --git a/mux.h b/mux.h
index 45eab34..c6c4421 100644
--- a/mux.h
+++ b/mux.h
@@ -6,17 +6,31 @@
 extern "C" {
 #include <libavcodec/avcodec.h>
 #include <libavformat/avformat.h>
-#include <libavformat/avio.h>
 }
 
+#include <sys/types.h>
+#include <atomic>
+#include <functional>
 #include <mutex>
-#include <queue>
+#include <string>
+#include <utility>
 #include <vector>
 
-class KeyFrameSignalReceiver {
-public:
-	// Needs to automatically turn the flag off again after actually receiving data.
-	virtual void signal_keyframe() = 0;
+struct MuxMetrics {
+	// “written” will usually be equal video + audio + mux overhead,
+	// except that there could be buffered packets that count in audio or video
+	// but not yet in written.
+	std::atomic<int64_t> metric_video_bytes{0}, metric_audio_bytes{0}, metric_written_bytes{0};
+
+	// Registers in global_metrics.
+	void init(const std::vector<std::pair<std::string, std::string>> &labels);
+
+	void reset()
+	{
+		metric_video_bytes = 0;
+		metric_audio_bytes = 0;
+		metric_written_bytes = 0;
+	}
 };
 
 class Mux {
@@ -26,8 +40,12 @@ 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 std::string &video_extradata, const AVCodecContext *audio_ctx, int time_base, 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.)
+	// Does not take ownership of <metrics>; elements in there, if any,
+	// will be added to.
+	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, const std::vector<MuxMetrics *> &metrics);
 	~Mux();
 	void add_packet(const AVPacket &pkt, int64_t pts, int64_t dts);
 
@@ -43,27 +61,17 @@ public:
 	void unplug();
 
 private:
-	void add_interleaved_packet(const AVPacket &pkt);  // Must be called with <mu> held.
-	void write_packet_with_signal(const AVPacket &pkt);  // Must be called with <mu> held.
+	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>.
 
-	// We need to do our own interleaving since we do explicit flushes
-	// before each keyframe. This queue contains every packet that we
-	// couldn't send yet, in add order. Essentially, we can't send a packet
-	// before we know we cannot receive an earlier (dts-wise) packet
-	// from another stream. This means that this queue will either contain
-	// video packets only or audio packets only, and as soon as a packet
-	// of the other type comes in, we can empty the flush the queue up
-	// to that point.
-	// Protected by <mu>.
-	std::queue<AVPacket *> waiting_packets;
-
 	AVStream *avstream_video, *avstream_audio;
-	KeyFrameSignalReceiver *keyframe_signal_receiver;
+
+	std::function<void(int64_t)> write_callback;
+	std::vector<MuxMetrics *> metrics;
 };
 
 #endif  // !defined(_MUX_H)