X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=shared%2Fmux.cpp;h=adec53de7923171842d90822a7ec8600b9e78fd0;hb=69ca346ecb6d52febde969af332142131a501d33;hp=48bfaa147ae53f7da8f04596274c067deadee400;hpb=c3a19b6de23967fd0257bf5ca9e7475efbb3fded;p=nageru

diff --git a/shared/mux.cpp b/shared/mux.cpp
index 48bfaa1..adec53d 100644
--- a/shared/mux.cpp
+++ b/shared/mux.cpp
@@ -47,13 +47,13 @@ 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, AVColorSpace color_space, int time_base, function<void(int64_t)> write_callback, WriteStrategy write_strategy, const vector<MuxMetrics *> &metrics)
+Mux::Mux(AVFormatContext *avctx, int width, int height, Codec video_codec, const string &video_extradata, const AVCodecParameters *audio_codecpar, AVColorSpace color_space, int time_base, function<void(int64_t)> write_callback, WriteStrategy write_strategy, const vector<MuxMetrics *> &metrics, WithSubtitles with_subtitles)
 	: write_strategy(write_strategy), avctx(avctx), write_callback(write_callback), metrics(metrics)
 {
 	AVStream *avstream_video = avformat_new_stream(avctx, nullptr);
 	if (avstream_video == nullptr) {
 		fprintf(stderr, "avformat_new_stream() failed\n");
-		exit(1);
+		abort();
 	}
 	avstream_video->time_base = AVRational{1, time_base};
 	avstream_video->codecpar->codec_type = AVMEDIA_TYPE_VIDEO;
@@ -94,16 +94,30 @@ Mux::Mux(AVFormatContext *avctx, int width, int height, Codec video_codec, const
 		AVStream *avstream_audio = avformat_new_stream(avctx, nullptr);
 		if (avstream_audio == nullptr) {
 			fprintf(stderr, "avformat_new_stream() failed\n");
-			exit(1);
+			abort();
 		}
 		avstream_audio->time_base = AVRational{1, time_base};
 		if (avcodec_parameters_copy(avstream_audio->codecpar, audio_codecpar) < 0) {
 			fprintf(stderr, "avcodec_parameters_copy() failed\n");
-			exit(1);
+			abort();
 		}
 		streams.push_back(avstream_audio);
 	}
 
+	if (with_subtitles == WITH_SUBTITLES) {
+		AVStream *avstream_subtitles = avformat_new_stream(avctx, nullptr);
+		if (avstream_subtitles == nullptr) {
+			fprintf(stderr, "avformat_new_stream() failed\n");
+			abort();
+		}
+		avstream_subtitles->time_base = AVRational{1, time_base};
+		avstream_subtitles->codecpar->codec_type = AVMEDIA_TYPE_SUBTITLE;
+		avstream_subtitles->codecpar->codec_id = AV_CODEC_ID_WEBVTT;
+		avstream_subtitles->disposition = AV_DISPOSITION_METADATA;
+		streams.push_back(avstream_subtitles);
+		subtitle_stream_idx = streams.size() - 1;
+	}
+
 	AVDictionary *options = NULL;
 	vector<pair<string, string>> opts = MUX_OPTS;
 	for (pair<string, string> opt : opts) {
@@ -111,7 +125,7 @@ Mux::Mux(AVFormatContext *avctx, int width, int height, Codec video_codec, const
 	}
 	if (avformat_write_header(avctx, &options) < 0) {
 		fprintf(stderr, "avformat_write_header() failed\n");
-		exit(1);
+		abort();
 	}
 	for (MuxMetrics *metric : metrics) {
 		metric->metric_written_bytes += avctx->pb->pos;
@@ -152,7 +166,7 @@ void Mux::add_packet(const AVPacket &pkt, int64_t pts, int64_t dts, AVRational t
 	av_init_packet(&pkt_copy);
 	if (av_packet_ref(&pkt_copy, &pkt) < 0) {
 		fprintf(stderr, "av_copy_packet() failed\n");
-		exit(1);
+		abort();
 	}
 	if (stream_index_override != -1) {
 		pkt_copy.stream_index = stream_index_override;