X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=video_encoder.h;h=9a9f861839e1834f3b2228c492527731928f3242;hb=7895dde165b0586eea324b4c9e07f8f0a2b7e1ba;hp=617b51842554b5db5f5325e4c1cfeafff94c591f;hpb=ab03e5e6f24b1651b4ca7df95e20aa5786939209;p=nageru

diff --git a/video_encoder.h b/video_encoder.h
index 617b518..9a9f861 100644
--- a/video_encoder.h
+++ b/video_encoder.h
@@ -16,6 +16,7 @@
 #include "ref_counted_frame.h"
 #include "ref_counted_gl_sync.h"
 
+class DiskSpaceEstimator;
 class HTTPD;
 class QSurface;
 class QuickSyncEncoder;
@@ -25,9 +26,9 @@ namespace movit {
 class ResourcePool;
 }  // namespace movit
 
-class VideoEncoder : public KeyFrameSignalReceiver {
+class VideoEncoder {
 public:
-	VideoEncoder(movit::ResourcePool *resource_pool, QSurface *surface, const std::string &va_display, int width, int height, HTTPD *httpd);
+	VideoEncoder(movit::ResourcePool *resource_pool, QSurface *surface, const std::string &va_display, int width, int height, HTTPD *httpd, DiskSpaceEstimator *disk_space_estimator);
 	~VideoEncoder();
 
 	void add_audio(int64_t pts, std::vector<float> audio);
@@ -37,15 +38,12 @@ public:
 	// Does a cut of the disk stream immediately ("frame" is used for the filename only).
 	void do_cut(int frame);
 
-	virtual void signal_keyframe() override {
-		stream_mux_writing_keyframes = true;
-	}
+	void change_x264_bitrate(unsigned rate_kbit);
 
 private:
 	void open_output_stream();
-	void close_output_stream();
-	static int write_packet_thunk(void *opaque, uint8_t *buf, int buf_size);
-	int write_packet(uint8_t *buf, int buf_size);
+	static int write_packet2_thunk(void *opaque, uint8_t *buf, int buf_size, AVIODataMarkerType type, int64_t time);
+	int write_packet2(uint8_t *buf, int buf_size, AVIODataMarkerType type, int64_t time);
 
 	AVOutputFormat *oformat;
 	std::mutex qs_mu;
@@ -55,18 +53,14 @@ private:
 	std::string va_display;
 	int width, height;
 	HTTPD *httpd;
+	DiskSpaceEstimator *disk_space_estimator;
 
 	std::unique_ptr<Mux> stream_mux;  // To HTTP.
 	std::unique_ptr<AudioEncoder> stream_audio_encoder;
 	std::unique_ptr<X264Encoder> x264_encoder;  // nullptr if not using x264.
 
-	// While Mux object is constructing, <stream_mux_writing_header> is true,
-	// and the header is being collected into stream_mux_header.
-	bool stream_mux_writing_header;
 	std::string stream_mux_header;
 
-	bool stream_mux_writing_keyframes = false;
-
 	std::atomic<int> quicksync_encoders_in_shutdown{0};
 
 	// Encoders that are shutdown, but need to call release_gl_resources()