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

diff --git a/nageru/av1_encoder.cpp b/nageru/av1_encoder.cpp
index 568cd5f..da18c6d 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);
@@ -144,7 +144,7 @@ void AV1Encoder::init_av1()
 	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.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.target_bit_rate = global_flags.av1_bitrate * 1000;
@@ -281,7 +281,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;	
@@ -295,7 +295,7 @@ void AV1Encoder::encode_frame(AV1Encoder::QueuedFrame qf)
 		pic.origin_x = 0;
 		pic.origin_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);