X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=shared%2Fmux.h;h=5020f37d943c64e98ee73c1d8e7771a2da88659d;hb=76deccd25a089f2a5a21bcc6054c75699cf752c3;hp=d3d7798fc237c2fcb583230c49be3ef7142ecad6;hpb=c3a19b6de23967fd0257bf5ca9e7475efbb3fded;p=nageru

diff --git a/shared/mux.h b/shared/mux.h
index d3d7798..5020f37 100644
--- a/shared/mux.h
+++ b/shared/mux.h
@@ -50,7 +50,7 @@ class Mux {
 public:
 	enum Codec {
 		CODEC_H264,
-		CODEC_NV12,  // Uncompressed 4:2:0.
+		CODEC_AV1,
 		CODEC_MJPEG
 	};
 	enum WriteStrategy {
@@ -64,6 +64,10 @@ public:
 		// higher overhead.
 		WRITE_BACKGROUND,
 	};
+	enum WithSubtitles {
+		WITH_SUBTITLES,
+		WITHOUT_SUBTITLES
+	};
 
 	// 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
@@ -72,9 +76,10 @@ public:
 	// will be added to.
 	//
 	// If audio_codecpar is nullptr, there will be no audio stream.
-	Mux(AVFormatContext *avctx, int width, int height, Codec video_codec, const std::string &video_extradata, const AVCodecParameters *audio_codecpar, AVColorSpace color_space, int time_base, std::function<void(int64_t)> write_callback, WriteStrategy write_strategy, const std::vector<MuxMetrics *> &metrics);
+	Mux(AVFormatContext *avctx, int width, int height, Codec video_codec, const std::string &video_extradata, const AVCodecParameters *audio_codecpar, AVColorSpace color_space, int time_base, std::function<void(int64_t)> write_callback, WriteStrategy write_strategy, const std::vector<MuxMetrics *> &metrics, WithSubtitles with_subtitles = WITHOUT_SUBTITLES);
 	~Mux();
 	void add_packet(const AVPacket &pkt, int64_t pts, int64_t dts, AVRational timebase = { 1, TIMEBASE }, int stream_index_override = -1);
+	int get_subtitle_stream_idx() const { return subtitle_stream_idx; }
 
 	// 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
@@ -87,10 +92,17 @@ public:
 	void plug();
 	void unplug();
 
+	// Temporary stop the mux; any packets coming in are discarded, and any existing ones
+	// in the queue will be dropped. Any writes in progress will finish as usual.
+	// Incompatible with plug().
+	void drain();
+	void undrain();
+
 private:
 	// If write_strategy == WRITE_FOREGORUND, Must be called with <mu> held.
 	void write_packet_or_die(const AVPacket &pkt, int64_t unscaled_pts);
 	void thread_func();
+	void write_header();
 
 	WriteStrategy write_strategy;
 
@@ -102,6 +114,7 @@ private:
 
 	AVFormatContext *avctx;  // Protected by <mu>, iff write_strategy == WRITE_BACKGROUND.
 	int plug_count = 0;  // Protected by <mu>.
+	bool drained = false;  // Protected by <mu>.
 
 	// Protected by <mu>. If write_strategy == WRITE_FOREGROUND,
 	// this is only in use when plugging.
@@ -113,6 +126,7 @@ private:
 	std::condition_variable packet_queue_ready;
 
 	std::vector<AVStream *> streams;
+	int subtitle_stream_idx = -1;
 
 	std::function<void(int64_t)> write_callback;
 	std::vector<MuxMetrics *> metrics;