Separate muxing entirely out of the HTTPD class.

[nageru] / mux.h

diff --git a/mux.h b/mux.h
index 2aefffcfeae704736a2ab1b8b3fd25593d1b1756..2eb8eeaa45f1472f471488736b9638ce382b2407 100644 (file)
--- a/mux.h
+++ b/mux.h
@@ -9,6 +9,12 @@ extern "C" {
 #include <libavformat/avio.h>
 }
 
+class KeyFrameSignalReceiver {
+public:
+       // Needs to automatically turn the flag off again after actually receiving data.
+       virtual void signal_keyframe() = 0;
+};
+
 class Mux {
 public:
        enum Codec {
@@ -16,14 +22,15 @@ public:
                CODEC_NV12,  // Uncompressed 4:2:0.
        };
 
-       Mux(AVFormatContext *avctx, int width, int height, Codec video_codec, int time_base);  // Takes ownership of avctx.
+       // 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();
        void add_packet(const AVPacket &pkt, int64_t pts, int64_t dts);
 
 private:
-       bool seen_keyframe = false;
        AVFormatContext *avctx;
        AVStream *avstream_video, *avstream_audio;
+       KeyFrameSignalReceiver *keyframe_signal_receiver;
 };
 
 #endif  // !defined(_MUX_H)