X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=mux.cpp;h=4f9f4d04a04d9a7221fbe696784c5b43f3158fbc;hb=b561d43a60201395f1354a585aa37670eda45883;hp=df974f0644520aa7c31ffb757abe1b733af2e480;hpb=f50d8a87fe399541b73c4e36ba2c78c4a8443447;p=nageru

diff --git a/mux.cpp b/mux.cpp
index df974f0..4f9f4d0 100644
--- a/mux.cpp
+++ b/mux.cpp
@@ -29,8 +29,8 @@ struct PacketBefore {
 	const AVFormatContext * const ctx;
 };
 
-Mux::Mux(AVFormatContext *avctx, int width, int height, Codec video_codec, const string &video_extradata, const AVCodecParameters *audio_codecpar, int time_base)
-	: avctx(avctx)
+Mux::Mux(AVFormatContext *avctx, int width, int height, Codec video_codec, const string &video_extradata, const AVCodecParameters *audio_codecpar, int time_base, std::function<void(int64_t)> write_callback)
+	: avctx(avctx), write_callback(write_callback)
 {
 	avstream_video = avformat_new_stream(avctx, nullptr);
 	if (avstream_video == nullptr) {
@@ -130,6 +130,14 @@ void Mux::add_packet(const AVPacket &pkt, int64_t pts, int64_t dts)
 	}
 
 	av_packet_unref(&pkt_copy);
+
+	// Note: This will be wrong in the case of plugged packets, but that only happens
+	// for network streams, not for files, and write callbacks are only really relevant
+	// for files. (We don't want to do this from write_packet_or_die, as it only has
+	// the rescaled pts, which is unsuitable for callback.)
+	if (pkt.stream_index == 0 && write_callback != nullptr) {
+		write_callback(pts);
+	}
 }
 
 void Mux::write_packet_or_die(const AVPacket &pkt)