Add some asserts to track down pts/dts problems before we get crashes back from FFmpe...

[nageru] / shared / mux.cpp

diff --git a/shared/mux.cpp b/shared/mux.cpp
index 48bfaa147ae53f7da8f04596274c067deadee400..921605574d0a496841bc42215c4573b24faf3170 100644 (file)
--- a/shared/mux.cpp
+++ b/shared/mux.cpp
@@ -47,21 +47,20 @@ 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;
        if (video_codec == CODEC_H264) {
                avstream_video->codecpar->codec_id = AV_CODEC_ID_H264;
-       } else if (video_codec == CODEC_NV12) {
-               avstream_video->codecpar->codec_id = AV_CODEC_ID_RAWVIDEO;
-               avstream_video->codecpar->codec_tag = avcodec_pix_fmt_to_codec_tag(AV_PIX_FMT_NV12);
+       } else if (video_codec == CODEC_AV1) {
+               avstream_video->codecpar->codec_id = AV_CODEC_ID_AV1;
        } else {
                assert(video_codec == CODEC_MJPEG);
                avstream_video->codecpar->codec_id = AV_CODEC_ID_MJPEG;
@@ -84,7 +83,7 @@ Mux::Mux(AVFormatContext *avctx, int width, int height, Codec video_codec, const
        avstream_video->codecpar->field_order = AV_FIELD_PROGRESSIVE;
 
        if (!video_extradata.empty()) {
-               avstream_video->codecpar->extradata = (uint8_t *)av_malloc(video_extradata.size());
+               avstream_video->codecpar->extradata = (uint8_t *)av_malloc(video_extradata.size() + AV_INPUT_BUFFER_PADDING_SIZE);
                avstream_video->codecpar->extradata_size = video_extradata.size();
                memcpy(avstream_video->codecpar->extradata, video_extradata.data(), video_extradata.size());
        }
@@ -94,24 +93,41 @@ 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) {
                av_dict_set(&options, opt.first.c_str(), opt.second.c_str(), 0);
        }
-       if (avformat_write_header(avctx, &options) < 0) {
-               fprintf(stderr, "avformat_write_header() failed\n");
-               exit(1);
+       int err = avformat_write_header(avctx, &options);
+       if (err < 0) {
+               char errbuf[AV_ERROR_MAX_STRING_SIZE];
+               av_strerror(err, errbuf, sizeof(errbuf));
+               fprintf(stderr, "avformat_write_header() failed: %s\n", errbuf);
+               exit(EXIT_FAILURE);
        }
        for (MuxMetrics *metric : metrics) {
                metric->metric_written_bytes += avctx->pb->pos;
@@ -148,11 +164,13 @@ Mux::~Mux()
 
 void Mux::add_packet(const AVPacket &pkt, int64_t pts, int64_t dts, AVRational timebase, int stream_index_override)
 {
+       assert(pts >= dts);
+
        AVPacket pkt_copy;
        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;
@@ -191,9 +209,12 @@ void Mux::write_packet_or_die(const AVPacket &pkt, int64_t unscaled_pts)
                }
        }
        int64_t old_pos = avctx->pb->pos;
-       if (av_interleaved_write_frame(avctx, const_cast<AVPacket *>(&pkt)) < 0) {
-               fprintf(stderr, "av_interleaved_write_frame() failed\n");
-               abort();
+       int err = av_interleaved_write_frame(avctx, const_cast<AVPacket *>(&pkt));
+       if (err < 0) {
+               char errbuf[AV_ERROR_MAX_STRING_SIZE];
+               av_strerror(err, errbuf, sizeof(errbuf));
+               fprintf(stderr, "av_interleaved_write_frame() failed: %s\n", errbuf);
+               exit(EXIT_FAILURE);
        }
        avio_flush(avctx->pb);
        for (MuxMetrics *metric : metrics) {