Suggestions from reviewer

Co-authored-by: Hugo Locurcio <[email protected]>

Author: berarma

doc/classes/ProjectSettings.xml

@@ -1114,18 +1114,15 @@
 			If you need to encode to a different format or pipe a stream through third-party software, you can extend this [MovieWriter] class to create your own movie writers.
 			When using PNG output, the frame number will be appended at the end of the file name. It starts from 0 and is padded with 8 digits to ensure correct sorting and easier processing. For example, if the output path is [code]/tmp/hello.png[/code], the first two frames will be [code]/tmp/hello00000000.png[/code] and [code]/tmp/hello00000001.png[/code]. The audio will be saved at [code]/tmp/hello.wav[/code].
 		</member>
-		<member name="editor/movie_writer/ogv/audio_quality" type="float" setter="" getter="" default="0.2">
+		<member name="editor/movie_writer/ogv/audio_quality" type="float" setter="" getter="" default="0.5">
 			The audio encoding quality to use when writing Vorbis audio to a file, between [code]-0.1[/code] and [code]1.0[/code] (inclusive). Higher [code]quality[/code] values result in better-sounding output at the cost of larger file sizes. Even at quality [code]1.0[/code], compression remains lossy.
-			[b]Note:[/b] This does not affect video quality.
+			[b]Note:[/b] This does not affect video quality, which is controlled by [member editor/movie_writer/video_quality] instead.
 		</member>
-		<member name="editor/movie_writer/ogv/encoding_speed" type="int" setter="" getter="" default="3">
-			Trades speed for compression. Speed [code]1[/code] is the slowest but provides the best compression. Speed [code]4[/code] is the fastest but provides the worst compression.
+		<member name="editor/movie_writer/ogv/encoding_speed" type="int" setter="" getter="" default="4">
+			The tradeoff between encoding speed and compression efficiency. Speed [code]1[/code] is the slowest but provides the best compression. Speed [code]4[/code] is the fastest but provides the worst compression. Video quality is generally not affected significantly by this setting.
 		</member>
 		<member name="editor/movie_writer/ogv/keyframe_interval" type="int" setter="" getter="" default="64">
-			Forces keyframes at the specified interval. Higher values can improve compression up to a certain level at the expense of some seek latency.
-		</member>
-		<member name="editor/movie_writer/ogv/video_bitrate" type="int" setter="" getter="" default="0">
-			When greater than [code]0[/code] CBR is used instead of VBR and sets the target bitrate for the video encoder in KB. The higher the value the better video quality and bigger file size. VBR should give better results and it's thus recommended to leave this value at [code]0[/code].
+			Forces keyframes at the specified interval (in frame count). Higher values can improve compression up to a certain level at the expense of higher latency when seeking.
 		</member>
 		<member name="editor/movie_writer/speaker_mode" type="int" setter="" getter="" default="0">
 			The speaker mode to use in the recorded audio when writing a movie. See [enum AudioServer.SpeakerMode] for possible values.

editor/editor_property_name_processor.cpp

@@ -245,6 +245,7 @@ EditorPropertyNameProcessor::EditorPropertyNameProcessor() {
 	//capitalize_string_remaps["msec"] = "(msec)"; // Unit.
 	capitalize_string_remaps["navmesh"] = "NavMesh";
 	capitalize_string_remaps["nfc"] = "NFC";
+	capitalize_string_remaps["ogv"] = "OGV";
 	capitalize_string_remaps["oidn"] = "OIDN";
 	capitalize_string_remaps["ok"] = "OK";
 	capitalize_string_remaps["opengl"] = "OpenGL";

modules/theora/movie_writer_ogv.cpp

@@ -423,7 +423,6 @@ MovieWriterOGV::MovieWriterOGV() {
 	speaker_mode = AudioServer::SpeakerMode(int(GLOBAL_GET("editor/movie_writer/speaker_mode")));
 	video_quality = GLOBAL_GET("editor/movie_writer/video_quality");
 	audio_quality = GLOBAL_GET("editor/movie_writer/ogv/audio_quality");
-	speed = 1 + (int)GLOBAL_GET("editor/movie_writer/ogv/encoding_speed");
-	video_bitrate = 1000 * (int)GLOBAL_GET("editor/movie_writer/ogv/video_bitrate");
+	speed = GLOBAL_GET("editor/movie_writer/ogv/encoding_speed");
 	keyframe_frequency = GLOBAL_GET("editor/movie_writer/ogv/keyframe_interval");
 }

modules/theora/movie_writer_ogv.h

@@ -51,7 +51,7 @@ class MovieWriterOGV : public MovieWriter {
 	Ref<FileAccess> f;
 
 	// Vorbis quality -0.1 to 1 (-0.1 yields smallest files but lowest fidelity; 1 yields highest fidelity but large files. '0.2' is a reasonable default).
-	float audio_quality = 0.2;
+	float audio_quality = 0.5;
 
 	// Bitrate target for Theora video.
 	int video_bitrate = 0;

servers/movie_writer/movie_writer.cpp

@@ -126,7 +126,7 @@ void MovieWriter::begin(const Size2i &p_movie_size, uint32_t p_fps, const String
 
 	cpu_time = 0.0f;
 	gpu_time = 0.0f;
-	encoding_time = 0;
+	encoding_time_usec = 0;
 
 	mix_rate = get_audio_mix_rate();
 	AudioDriverDummy::get_dummy_singleton()->set_mix_rate(mix_rate);
@@ -157,10 +157,9 @@ void MovieWriter::_bind_methods() {
 	GLOBAL_DEF(PropertyInfo(Variant::INT, "editor/movie_writer/mix_rate", PROPERTY_HINT_RANGE, "8000,192000,1,suffix:Hz"), 48000);
 	GLOBAL_DEF(PropertyInfo(Variant::INT, "editor/movie_writer/speaker_mode", PROPERTY_HINT_ENUM, "Stereo,3.1,5.1,7.1"), 0);
 	GLOBAL_DEF(PropertyInfo(Variant::FLOAT, "editor/movie_writer/video_quality", PROPERTY_HINT_RANGE, "0.0,1.0,0.01"), 0.75);
-	GLOBAL_DEF(PropertyInfo(Variant::FLOAT, "editor/movie_writer/ogv/audio_quality", PROPERTY_HINT_RANGE, "-0.1,1.0,0.01"), 0.2);
-	GLOBAL_DEF(PropertyInfo(Variant::INT, "editor/movie_writer/ogv/encoding_speed", PROPERTY_HINT_ENUM, "1,2,3,4"), 3);
+	GLOBAL_DEF(PropertyInfo(Variant::FLOAT, "editor/movie_writer/ogv/audio_quality", PROPERTY_HINT_RANGE, "-0.1,1.0,0.01"), 0.5);
+	GLOBAL_DEF(PropertyInfo(Variant::INT, "editor/movie_writer/ogv/encoding_speed", PROPERTY_HINT_ENUM, "Fastest (Lowest Efficiency):4,Fast (Low Efficiency):3,Slow (High Efficiency):2,Slowest (Highest Efficiency):1"), 4);
 	GLOBAL_DEF(PropertyInfo(Variant::INT, "editor/movie_writer/ogv/keyframe_interval", PROPERTY_HINT_RANGE, "1,1024,1"), 64);
-	GLOBAL_DEF(PropertyInfo(Variant::INT, "editor/movie_writer/ogv/video_bitrate", PROPERTY_HINT_RANGE, "0,100000,1000"), 0);
 
 	// Used by the editor.
 	GLOBAL_DEF_BASIC("editor/movie_writer/movie_file", "");
@@ -218,17 +217,17 @@ void MovieWriter::add_frame() {
 
 	AudioDriverDummy::get_dummy_singleton()->mix_audio(mix_rate / fps, audio_mix_buffer.ptr());
 
-	int encoding_start = Time::get_singleton()->get_ticks_usec();
+	uint64_t encoding_start_usec = Time::get_singleton()->get_ticks_usec();
 	write_frame(vp_tex, audio_mix_buffer.ptr());
-	int encoding_end = Time::get_singleton()->get_ticks_usec();
-	encoding_time += encoding_end - encoding_start;
+	uint64_t encoding_end_usec = Time::get_singleton()->get_ticks_usec();
+	encoding_time_usec += encoding_end_usec - encoding_start_usec;
 }
 
 void MovieWriter::end() {
-	int encoding_start = Time::get_singleton()->get_ticks_usec();
+	uint64_t encoding_start_usec = Time::get_singleton()->get_ticks_usec();
 	write_end();
-	int encoding_end = Time::get_singleton()->get_ticks_usec();
-	encoding_time += encoding_end - encoding_start;
+	uint64_t encoding_end_usec = Time::get_singleton()->get_ticks_usec();
+	encoding_time_usec += encoding_end_usec - encoding_start_usec;
 
 	// Print a report with various statistics.
 	print_line("--------------------------------------------------------------------------------");
@@ -255,8 +254,8 @@ void MovieWriter::end() {
 			String::num(real_time_seconds % 60, 0).pad_zeros(2));
 
 	print_line(vformat("%d frames at %d FPS (movie length: %s), recorded in %s (%d%% of real-time speed).", Engine::get_singleton()->get_frames_drawn(), fps, movie_time, real_time, (float(MAX(1, movie_time_seconds)) / MAX(1, real_time_seconds)) * 100));
-	print_line(vformat("CPU time: %.2f seconds (average: %.2f ms/frame)", cpu_time / 1000, cpu_time / Engine::get_singleton()->get_frames_drawn()));
-	print_line(vformat("GPU time: %.2f seconds (average: %.2f ms/frame)", gpu_time / 1000, gpu_time / Engine::get_singleton()->get_frames_drawn()));
-	print_line(vformat("Encoding time: %.2f seconds (average: %.2f ms/frame)", encoding_time / 1000000.f, encoding_time / 1000.f / Engine::get_singleton()->get_frames_drawn()));
+	print_line(vformat("CPU render time: %.2f seconds (average: %.2f ms/frame)", cpu_time / 1000, cpu_time / Engine::get_singleton()->get_frames_drawn()));
+	print_line(vformat("GPU render time: %.2f seconds (average: %.2f ms/frame)", gpu_time / 1000, gpu_time / Engine::get_singleton()->get_frames_drawn()));
+	print_line(vformat("Encoding time: %.2f seconds (average: %.2f ms/frame)", encoding_time_usec / 1000000.f, encoding_time_usec / 1000.f / Engine::get_singleton()->get_frames_drawn()));
 	print_line("--------------------------------------------------------------------------------");
 }

servers/movie_writer/movie_writer.h

@@ -43,7 +43,7 @@ class MovieWriter : public Object {
 
 	float cpu_time = 0.0f;
 	float gpu_time = 0.0f;
-	int encoding_time = 0;
+	uint64_t encoding_time_usec = 0;
 
 	String project_name;