Write 1.4.0 changelog.

[nageru] / mux.h

diff --git a/mux.h b/mux.h
index c161b298d2e27408b4bbb23fc3f596abfd456515..ddf97fe92a591d86ec6dbebd9614cf32fa9a0846 100644 (file)
--- a/mux.h
+++ b/mux.h
@@ -6,16 +6,13 @@
 extern "C" {
 #include <libavcodec/avcodec.h>
 #include <libavformat/avformat.h>
-#include <libavformat/avio.h>
 }
 
+#include <sys/types.h>
+#include <functional>
 #include <mutex>
-
-class KeyFrameSignalReceiver {
-public:
-       // Needs to automatically turn the flag off again after actually receiving data.
-       virtual void signal_keyframe() = 0;
-};
+#include <string>
+#include <vector>
 
 class Mux {
 public:
@@ -24,16 +21,35 @@ public:
                CODEC_NV12,  // Uncompressed 4:2:0.
        };
 
-       // Takes ownership of avctx. <keyframe_signal_receiver> can be nullptr.
-       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);
+       // Takes ownership of avctx. <write_callback> will be called every time
+       // a write has been made to the video stream (id 0), with the pts of
+       // the just-written frame. (write_callback can be nullptr.)
+       Mux(AVFormatContext *avctx, int width, int height, Codec video_codec, const std::string &video_extradata, const AVCodecParameters *audio_codecpar, int time_base, std::function<void(int64_t)> write_callback);
        ~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 <ctx_mu>.
+       void write_packet_or_die(const AVPacket &pkt);  // Must be called with <mu> held.
+
+       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;
+
+       std::function<void(int64_t)> write_callback;
 };
 
 #endif  // !defined(_MUX_H)