X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=mux.h;h=47855f728ae82b5d09d9a180c0035fc59d770027;hb=ab03e5e6f24b1651b4ca7df95e20aa5786939209;hp=c161b298d2e27408b4bbb23fc3f596abfd456515;hpb=64f9314bfe9b21fed7304a4d08a35d80e8c73144;p=nageru diff --git a/mux.h b/mux.h index c161b29..47855f7 100644 --- a/mux.h +++ b/mux.h @@ -10,6 +10,7 @@ extern "C" { } #include +#include class KeyFrameSignalReceiver { public: @@ -29,9 +30,23 @@ public: ~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: - std::mutex ctx_mu; - AVFormatContext *avctx; // Protected by . + std::mutex mu; + AVFormatContext *avctx; // Protected by . + int plug_count = 0; // Protected by . + std::vector plugged_packets; // Protected by . + AVStream *avstream_video, *avstream_audio; KeyFrameSignalReceiver *keyframe_signal_receiver; };