X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=mux.h;h=ddf97fe92a591d86ec6dbebd9614cf32fa9a0846;hb=02f65224836f4e7ccecfb89ccd8dc38ee32f319a;hp=b3ea0120736e13c8cecd2daad5dc0975cd584df3;hpb=319b807ceede52e45cf07f712259b1a42ec3cc54;p=nageru

diff --git a/mux.h b/mux.h
index b3ea012..ddf97fe 100644
--- a/mux.h
+++ b/mux.h
@@ -6,11 +6,12 @@
 extern "C" {
 #include <libavcodec/avcodec.h>
 #include <libavformat/avformat.h>
-#include <libavformat/avio.h>
 }
 
+#include <sys/types.h>
+#include <functional>
 #include <mutex>
-#include <queue>
+#include <string>
 #include <vector>
 
 class Mux {
@@ -20,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 AVCodecParameters *audio_codecpar, int time_base);
+	// 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);
 
@@ -45,6 +48,8 @@ private:
 	std::vector<AVPacket *> plugged_packets;  // Protected by <mu>.
 
 	AVStream *avstream_video, *avstream_audio;
+
+	std::function<void(int64_t)> write_callback;
 };
 
 #endif  // !defined(_MUX_H)