When muxing in the background, write the header in the background, too.

[nageru] / shared / mux.cpp

diff --git a/shared/mux.cpp b/shared/mux.cpp
index 819638c480c04f22a98a6364ecf1b1cb59ef569c..46f727c8a1636c9cb2869aa862e3d88e34a23c1f 100644 (file)
--- a/shared/mux.cpp
+++ b/shared/mux.cpp
@@ -124,27 +124,10 @@ Mux::Mux(AVFormatContext *avctx, int width, int height, Codec video_codec, const
                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);
-       }
-       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;
-       }
-
-       // Make sure the header is written before the constructor exits.
-       avio_flush(avctx->pb);
-
        if (write_strategy == WRITE_BACKGROUND) {
                writer_thread = thread(&Mux::thread_func, this);
+       } else {
+               write_header();
        }
 }
 
@@ -264,6 +247,8 @@ void Mux::thread_func()
 {
        pthread_setname_np(pthread_self(), "Mux");
 
+       write_header();
+
        unique_lock<mutex> lock(mu);
        for ( ;; ) {
                packet_queue_ready.wait(lock, [this]() {
@@ -287,6 +272,30 @@ void Mux::thread_func()
        }
 }
 
+void Mux::write_header()
+{
+       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);
+       }
+
+       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;
+       }
+
+       // Make sure the header is written before the constructor exits
+       // (assuming we are in WRITE_FOREGROUND mode).
+       avio_flush(avctx->pb);
+}
+
 void MuxMetrics::init(const vector<pair<string, string>> &labels)
 {
        vector<pair<string, string>> labels_video = labels;