When doing a cut, do the shutdown in a separate thread.

[nageru] / mux.h

diff --git a/mux.h b/mux.h
index 2eb8eeaa45f1472f471488736b9638ce382b2407..47855f728ae82b5d09d9a180c0035fc59d770027 100644 (file)
--- a/mux.h
+++ b/mux.h
@@ -9,6 +9,9 @@ extern "C" {
 #include <libavformat/avio.h>
 }
 
+#include <mutex>
+#include <vector>
+
 class KeyFrameSignalReceiver {
 public:
        // Needs to automatically turn the flag off again after actually receiving data.
@@ -23,12 +26,27 @@ public:
        };
 
        // Takes ownership of avctx. <keyframe_signal_receiver> can be nullptr.
-       Mux(AVFormatContext *avctx, int width, int height, Codec video_codec, const AVCodec *codec_audio, int time_base, int bit_rate, KeyFrameSignalReceiver *keyframe_signal_receiver);
+       Mux(AVFormatContext *avctx, int width, int height, Codec video_codec, const std::string &video_extradata, const AVCodecContext *audio_ctx, int time_base, KeyFrameSignalReceiver *keyframe_signal_receiver);
        ~Mux();
        void add_packet(const AVPacket &pkt, int64_t pts, int64_t dts);
 
+       // 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
+       // and written. This is primarily useful if you might have two different encoders
+       // writing to the mux at the same time (because one is shutting down), so that
+       // pts might otherwise come out-of-order.
+       //
+       // You can plug and unplug multiple times; only when the plug count reaches zero,
+       // something will actually happen.
+       void plug();
+       void unplug();
+
 private:
-       AVFormatContext *avctx;
+       std::mutex mu;
+       AVFormatContext *avctx;  // Protected by <mu>.
+       int plug_count = 0;  // Protected by <mu>.
+       std::vector<AVPacket *> plugged_packets;  // Protected by <mu>.
+
        AVStream *avstream_video, *avstream_audio;
        KeyFrameSignalReceiver *keyframe_signal_receiver;
 };