X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=nageru%2Fquicksync_encoder_impl.h;h=c40567c43eb68c4325cc335193460aef9b68c5f1;hb=ba3ea588faa8e7908bce832820c08e43a09863fe;hp=50741152f4a11801f613af5986eb1793a6480ff1;hpb=bdc9f1ea04141e71906d486f9d254c3346835e72;p=nageru

diff --git a/nageru/quicksync_encoder_impl.h b/nageru/quicksync_encoder_impl.h
index 5074115..c40567c 100644
--- a/nageru/quicksync_encoder_impl.h
+++ b/nageru/quicksync_encoder_impl.h
@@ -39,11 +39,11 @@ class ResourcePool;
 }
 class DiskSpaceEstimator;
 class QSurface;
-class X264Encoder;
+class VideoCodecInterface;
 
 class QuickSyncEncoderImpl {
 public:
-	QuickSyncEncoderImpl(const std::string &filename, movit::ResourcePool *resource_pool, QSurface *surface, const std::string &va_display, int width, int height, const AVOutputFormat *oformat, X264Encoder *http_encoder, X264Encoder *disk_encoder, DiskSpaceEstimator *disk_space_estimator);
+	QuickSyncEncoderImpl(const std::string &filename, movit::ResourcePool *resource_pool, QSurface *surface, const std::string &va_display, int width, int height, const AVOutputFormat *oformat, VideoCodecInterface *http_encoder, VideoCodecInterface *disk_encoder, DiskSpaceEstimator *disk_space_estimator);
 	~QuickSyncEncoderImpl();
 	void add_audio(int64_t pts, std::vector<float> audio);
 	bool is_zerocopy() const;
@@ -59,7 +59,7 @@ public:
 
 	// So we never get negative dts.
 	int64_t global_delay() const {
-		return int64_t(ip_period - 1) * (TIMEBASE / MAX_FPS);
+		return int64_t(ip_period - 1) * (TIMEBASE / TYPICAL_FPS);
 	}
 
 private:
@@ -111,7 +111,6 @@ private:
 	void open_output_file(const std::string &filename);
 	void encode_thread_func();
 	void encode_remaining_frames_as_p(int encoding_frame_num, int gop_start_display_frame_num, int64_t last_dts);
-	void add_packet_for_uncompressed_frame(int64_t pts, int64_t duration, const uint8_t *data);
 	void pass_frame(PendingFrame frame, int display_frame_num, int64_t pts, int64_t duration);
 	void encode_frame(PendingFrame frame, int encoding_frame_num, int display_frame_num, int gop_start_display_frame_num,
 	                  int frame_type, int64_t pts, int64_t dts, int64_t duration, movit::YCbCrLumaCoefficients ycbcr_coefficients);
@@ -171,8 +170,8 @@ private:
 	std::mutex file_audio_encoder_mutex;
 	std::unique_ptr<AudioEncoder> file_audio_encoder;
 
-	X264Encoder *x264_http_encoder;  // nullptr if not using x264.
-	X264Encoder *x264_disk_encoder;
+	VideoCodecInterface *http_encoder;  // nullptr if not using x264/SVT-AV1.
+	VideoCodecInterface *disk_encoder;
 	std::unique_ptr<V4LOutput> v4l_output;  // nullptr if not using V4L2 output.
 
 	Mux* stream_mux = nullptr;  // To HTTP.
@@ -210,7 +209,7 @@ private:
 	static constexpr int initial_qp = 15;
 	static constexpr int minimal_qp = 0;
 	static constexpr int intra_period = 30;
-	static constexpr int intra_idr_period = MAX_FPS;  // About a second; more at lower frame rates. Not ideal.
+	static constexpr int intra_idr_period = TYPICAL_FPS;  // About a second; more at lower frame rates. Not ideal.
 
 	// Quality settings that are meant to be static, but might be overridden
 	// by the profile.