Remove dead code

Author: Calinou

servers/movie_writer/movie_writer_ogv.cpp

@@ -174,12 +174,7 @@ Error MovieWriterOGV::write_begin(const Size2i &p_movie_size, uint32_t p_fps, co
 
 	// Initialize Vorbis audio encoding.
 	vorbis_info_init(&vi);
-	int ret = 0;
-	if (audio_bitrate == 0) {
-		ret = vorbis_encode_init_vbr(&vi, audio_ch, mix_rate, audio_quality);
-	} else {
-		ret = vorbis_encode_init(&vi, audio_ch, mix_rate, -1, (int)(64870 * (ogg_int64_t)audio_bitrate >> 16), -1);
-	}
+	int ret = vorbis_encode_init_vbr(&vi, audio_ch, mix_rate, audio_quality);
 	ERR_FAIL_COND_V_MSG(ret, ERR_UNAVAILABLE, "The Ogg Vorbis encoder couldn't set up a mode according to the requested quality or bitrate.");
 
 	vorbis_comment_init(&vc);
@@ -230,43 +225,6 @@ Error MovieWriterOGV::write_begin(const Size2i &p_movie_size, uint32_t p_fps, co
 		ERR_PRINT("Couldn't set keyframe interval.");
 	}
 
-	if (vp3_compatible) {
-		ret = th_encode_ctl(td, TH_ENCCTL_SET_VP3_COMPATIBLE, &vp3_compatible, sizeof(vp3_compatible));
-		if (ret < 0) {
-			ERR_PRINT("Could not enable strict VP3 compatibility");
-		}
-	}
-
-	// Reverse the rate control flags to favor a "long time" strategy.
-	if (soft_target) {
-		int arg = TH_RATECTL_CAP_UNDERFLOW;
-		ret = th_encode_ctl(td, TH_ENCCTL_SET_RATE_FLAGS, &arg, sizeof(arg));
-		if (ret < 0) {
-			ERR_PRINT("Couldn't set encoder flags for soft-target.");
-		}
-
-		if (buffer_delay < 0) {
-			if ((keyframe_frequency * 7 >> 1) > 5 * fps) {
-				arg = keyframe_frequency * 7 >> 1;
-			} else {
-				arg = 5 * fps;
-			}
-			ret = th_encode_ctl(td, TH_ENCCTL_SET_RATE_BUFFER, &arg, sizeof(arg));
-			if (ret < 0) {
-				ERR_PRINT("Couldn't set rate control buffer for soft-target.");
-			}
-		}
-	}
-
-	// Now we can set the buffer delay if the user requested a non-default one
-	// (this has to be done after two-pass is enabled).
-	if (buffer_delay >= 0) {
-		ret = th_encode_ctl(td, TH_ENCCTL_SET_RATE_BUFFER, &buffer_delay, sizeof(buffer_delay));
-		if (ret < 0) {
-			WARN_PRINT("Couldn't set desired buffer delay.");
-		}
-	}
-
 	// Speed should also be set after the current encoder mode is established,
 	// since the available speed levels may change depending on the encoder mode.
 	if (speed >= 0) {

servers/movie_writer/movie_writer_ogv.h

@@ -50,15 +50,9 @@ class MovieWriterOGV : public MovieWriter {
 
 	Ref<FileAccess> f;
 
-	// Bitrate target for Vorbis audio.
-	int audio_bitrate = 0;
-
 	// 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;
 
-	// VP3 strict compatibility.
-	int vp3_compatible = 0;
-
 	// Bitrate target for Theora video.
 	int video_bitrate = 0;
 
@@ -68,21 +62,12 @@ class MovieWriterOGV : public MovieWriter {
 	// Video stream keyframe frequency (one every N frames).
 	ogg_uint32_t keyframe_frequency = 64;
 
-	// Buffer delay (in frames). Longer delays allow smoother rate adaptation and provide better overall quality, but require more
-	// client side buffering and add latency. The default value is the keyframe interval for one-pass encoding (or somewhat larger if
-	// soft-target is used).
-	int buffer_delay = -1;
-
 	// Sets the encoder speed level. Higher speed levels favor quicker encoding over better quality per bit. Depending on the encoding
 	// mode, and the internal algorithms used, quality may actually improve with higher speeds, but in this case bitrate will also
 	// likely increase. The maximum value, and the meaning of each value, are implementation-specific and may change depending on the
 	// current encoding mode.
 	int speed = 4;
 
-	// Use a large reservoir and treat the rate as a soft target; rate control is less strict but resulting quality is usually
-	// higher/smoother overall. Soft target also allows an optional setting to specify a minimum allowed quality.
-	bool soft_target = true;
-
 	// Take physical pages, weld into a logical stream of packets.
 	ogg_stream_state to;