X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=nageru%2Fav1_encoder.cpp;h=13f0e30e3e9162fd5689883290d448205ae07e22;hb=HEAD;hp=da18c6d79dd079823b09d0e32e970b1dc9a6cd88;hpb=f34a3e1bbc207541842e0b54d5418d95bafc8e5b;p=nageru

diff --git a/nageru/av1_encoder.cpp b/nageru/av1_encoder.cpp
index da18c6d..bb6c17b 100644
--- a/nageru/av1_encoder.cpp
+++ b/nageru/av1_encoder.cpp
@@ -132,12 +132,22 @@ void AV1Encoder::add_frame(int64_t pts, int64_t duration, YCbCrLumaCoefficients
 void AV1Encoder::init_av1()
 {
 	EbSvtAv1EncConfiguration config;
+
+	// svt_av1_enc_init_handle() is defined to fill config with the defaults;
+	// yet, seemingly, not everything is written, and some of it can cause
+	// Valgrind warnings and/or crashes. It should never hurt to put it
+	// into a known state beforehand, and it seems to fix the crashes,
+	// so we do that.
+	memset(&config, 0, sizeof(config));
+
 	EbErrorType ret = svt_av1_enc_init_handle(&encoder, nullptr, &config);
 	if (ret != EB_ErrorNone) {
 		fprintf(stderr, "Error initializing SVT-AV1 handle (error %08x)\n", ret);
 		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;
@@ -145,8 +155,7 @@ void AV1Encoder::init_av1()
 	config.frame_rate_numerator = global_flags.av1_fps_num;
 	config.frame_rate_denominator = global_flags.av1_fps_den;
 	config.encoder_bit_depth = global_flags.bit_depth;
-	config.rate_control_mode = 2;  // CBR.
-	config.pred_structure = 1;  // PRED_LOW_DELAY_B (needed for CBR).
+	config.rate_control_mode = 1;  // VBR.
 	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 +167,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) {
@@ -205,7 +212,7 @@ void AV1Encoder::init_av1()
 		global_headers = string(reinterpret_cast<const char *>(header->p_buffer), header->n_filled_len);
 
 		svt_av1_enc_stream_header_release(header);  // Don't care about errors.
-          }
+	}
 }
 
 void AV1Encoder::encoder_thread_func()
@@ -292,8 +299,8 @@ 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.bit_depth > 8 ? EB_TEN_BIT : EB_EIGHT_BIT;
 
@@ -302,7 +309,7 @@ void AV1Encoder::encode_frame(AV1Encoder::QueuedFrame qf)
 		hdr.n_alloc_len   = (global_flags.width * global_flags.height * 3 / 2) * bytes_per_pixel;
 		hdr.n_filled_len  = hdr.n_alloc_len;
 		hdr.n_tick_count  = 0;
-		hdr.p_app_private = reinterpret_cast<void *>(intptr_t(qf.duration));
+		hdr.p_app_private = nullptr;
 		hdr.pic_type      = EB_AV1_INVALID_PICTURE;  // Actually means auto, according to FFmpeg.
 		hdr.metadata      = nullptr;
 		hdr.flags         = 0;