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

diff --git a/mux.h b/mux.h
index 47855f7..3f5007d 100644
--- a/mux.h
+++ b/mux.h
@@ -9,15 +9,11 @@ extern "C" {
 #include <libavformat/avio.h>
 }
 
+#include <functional>
 #include <mutex>
+#include <queue>
 #include <vector>
 
-class KeyFrameSignalReceiver {
-public:
-	// Needs to automatically turn the flag off again after actually receiving data.
-	virtual void signal_keyframe() = 0;
-};
-
 class Mux {
 public:
 	enum Codec {
@@ -25,8 +21,10 @@ 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.)
+	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);
 
@@ -42,13 +40,16 @@ public:
 	void unplug();
 
 private:
+	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)