X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=nageru%2Fav1_encoder.cpp;h=e571184585f33a5637b958d07215f0ef98dfab20;hb=0f0780d0c2f321ecb72d3b6f3a70136cdc26265e;hp=568cd5f9acc3673c425f393fd145416b6e8782e8;hpb=d92973cb0206e84529011bc8edd644e1a25374bd;p=nageru

diff --git a/nageru/av1_encoder.cpp b/nageru/av1_encoder.cpp
index 568cd5f..e571184 100644
--- a/nageru/av1_encoder.cpp
+++ b/nageru/av1_encoder.cpp
@@ -63,7 +63,7 @@ AV1Encoder::AV1Encoder(const AVOutputFormat *oformat)
 			av1_latency_histogram.init("av1");
 		});
 
-	const size_t bytes_per_pixel = global_flags.av1_bit_depth > 8 ? 2 : 1;
+	const size_t bytes_per_pixel = global_flags.bit_depth > 8 ? 2 : 1;
 	frame_pool.reset(new uint8_t[global_flags.width * global_flags.height * 2 * bytes_per_pixel * AV1_QUEUE_LENGTH]);
 	for (unsigned i = 0; i < AV1_QUEUE_LENGTH; ++i) {
 		free_frames.push(frame_pool.get() + i * (global_flags.width * global_flags.height * 2 * bytes_per_pixel));
@@ -104,7 +104,7 @@ void AV1Encoder::add_frame(int64_t pts, int64_t duration, YCbCrLumaCoefficients
 	// SVT-AV1 makes its own copy, though, and it would have been nice to avoid the
 	// double-copy (and also perhaps let the GPU do the 10-bit compression SVT-AV1
 	// wants, instead of doing it on the CPU).
-	const size_t bytes_per_pixel = global_flags.av1_bit_depth > 8 ? 2 : 1;
+	const size_t bytes_per_pixel = global_flags.bit_depth > 8 ? 2 : 1;
 	size_t frame_size = global_flags.width * global_flags.height * bytes_per_pixel;
 	assert(global_flags.width % 2 == 0);
 	assert(global_flags.height % 2 == 0);
@@ -112,7 +112,7 @@ void AV1Encoder::add_frame(int64_t pts, int64_t duration, YCbCrLumaCoefficients
 	uint8_t *cb = y + frame_size;
 	uint8_t *cr = cb + frame_size / 4;
 	memcpy(y, data, frame_size);
-	if (global_flags.av1_bit_depth == 8) {
+	if (global_flags.bit_depth == 8) {
 		memcpy_interleaved(cb, cr, data + frame_size, frame_size / 2);
 	} else {
 		const uint16_t *src = reinterpret_cast<const uint16_t *>(data + frame_size);
@@ -138,15 +138,15 @@ void AV1Encoder::init_av1()
 		exit(EXIT_FAILURE);
 	}
 
+	// NOTE: We don't set CBR, as it requires low-delay mode, which is
+	// generally problematic wrt. quality and performance.
 	config.enc_mode = global_flags.av1_preset;
 	config.intra_period_length = 63;  // Approx. one second, conforms to the (n % 8) - 1 == 0 rule.
 	config.source_width = global_flags.width;
 	config.source_height = global_flags.height;
 	config.frame_rate_numerator = global_flags.av1_fps_num;
 	config.frame_rate_denominator = global_flags.av1_fps_den;
-	config.encoder_bit_depth = global_flags.av1_bit_depth;
-	config.rate_control_mode = 2;  // CBR.
-	config.pred_structure = 1;  // PRED_LOW_DELAY_B (needed for CBR).
+	config.encoder_bit_depth = global_flags.bit_depth;
 	config.target_bit_rate = global_flags.av1_bitrate * 1000;
 
 	// NOTE: These should be in sync with the ones in quicksync_encoder.cpp (sps_rbsp()).
@@ -158,9 +158,7 @@ void AV1Encoder::init_av1()
 		config.matrix_coefficients = EB_CICP_MC_BT_601;
 	}
 	config.color_range = EB_CR_STUDIO_RANGE;
-#if SVT_AV1_CHECK_VERSION(1, 0, 0)
 	config.chroma_sample_position = EB_CSP_VERTICAL;
-#endif
 
 	const vector<string> &extra_param = global_flags.av1_extra_param;
 	for (const string &str : extra_param) {
@@ -281,7 +279,7 @@ void AV1Encoder::encoder_thread_func()
 void AV1Encoder::encode_frame(AV1Encoder::QueuedFrame qf)
 {
 	if (qf.data) {
-		const size_t bytes_per_pixel = global_flags.av1_bit_depth > 8 ? 2 : 1;
+		const size_t bytes_per_pixel = global_flags.bit_depth > 8 ? 2 : 1;
 
 		EbSvtIOFormat pic;
 		pic.luma = qf.data;	
@@ -292,10 +290,10 @@ void AV1Encoder::encode_frame(AV1Encoder::QueuedFrame qf)
 		pic.cr_stride = global_flags.width / 2;  // Likewise.
 		pic.width = global_flags.width;
 		pic.height = global_flags.height;
-		pic.origin_x = 0;
-		pic.origin_y = 0;
+		pic.org_x = 0;
+		pic.org_y = 0;
 		pic.color_fmt = EB_YUV420;
-		pic.bit_depth = global_flags.av1_bit_depth > 8 ? EB_TEN_BIT : EB_EIGHT_BIT;
+		pic.bit_depth = global_flags.bit_depth > 8 ? EB_TEN_BIT : EB_EIGHT_BIT;
 
 		EbBufferHeaderType hdr;
 		hdr.p_buffer      = reinterpret_cast<uint8_t *>(&pic);