Set x264 global headers (Quick Sync global headers are still not there).

[nageru] / mux.h

diff --git a/mux.h b/mux.h
index 2eb8eeaa45f1472f471488736b9638ce382b2407..c161b298d2e27408b4bbb23fc3f596abfd456515 100644 (file)
--- a/mux.h
+++ b/mux.h
@@ -9,6 +9,8 @@ extern "C" {
 #include <libavformat/avio.h>
 }
 
+#include <mutex>
+
 class KeyFrameSignalReceiver {
 public:
        // Needs to automatically turn the flag off again after actually receiving data.
@@ -23,12 +25,13 @@ 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);
 
 private:
-       AVFormatContext *avctx;
+       std::mutex ctx_mu;
+       AVFormatContext *avctx;  // Protected by <ctx_mu>.
        AVStream *avstream_video, *avstream_audio;
        KeyFrameSignalReceiver *keyframe_signal_receiver;
 };