X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=cap_ogg.c;h=eef3f90d6e3503b5febb2172d58ca318915a6389;hb=b32e6e3114c2bcbe6737cbacd1e66f912b2340ab;hp=a5218655330970ff3019ed7088eacf841d3b1ca5;hpb=bd172244c077be2f4f13caf8cabd022fcad4bd33;p=xonotic%2Fdarkplaces.git

diff --git a/cap_ogg.c b/cap_ogg.c
index a5218655..eef3f90d 100644
--- a/cap_ogg.c
+++ b/cap_ogg.c
@@ -9,7 +9,7 @@
 
 // video capture cvars
 static cvar_t cl_capturevideo_ogg_theora_vp3compat = {CVAR_SAVE, "cl_capturevideo_ogg_theora_vp3compat", "1", "make VP3 compatible theora streams"};
-static cvar_t cl_capturevideo_ogg_theora_quality = {CVAR_SAVE, "cl_capturevideo_ogg_theora_quality", "42", "video quality factor (0 to 63), or -1 to use bitrate only; higher is better; setting both to -1 achieves unlimited quality"};
+static cvar_t cl_capturevideo_ogg_theora_quality = {CVAR_SAVE, "cl_capturevideo_ogg_theora_quality", "48", "video quality factor (0 to 63), or -1 to use bitrate only; higher is better; setting both to -1 achieves unlimited quality"};
 static cvar_t cl_capturevideo_ogg_theora_bitrate = {CVAR_SAVE, "cl_capturevideo_ogg_theora_bitrate", "-1", "video bitrate (45 to 2000 kbps), or -1 to use quality only; higher is better; setting both to -1 achieves unlimited quality"};
 static cvar_t cl_capturevideo_ogg_theora_keyframe_bitrate_multiplier = {CVAR_SAVE, "cl_capturevideo_ogg_theora_keyframe_bitrate_multiplier", "1.5", "how much more bit rate to use for keyframes, specified as a factor of at least 1"};
 static cvar_t cl_capturevideo_ogg_theora_keyframe_maxinterval = {CVAR_SAVE, "cl_capturevideo_ogg_theora_keyframe_maxinterval", "64", "maximum keyframe interval (1 to 1000)"};
@@ -1015,14 +1015,13 @@ void SCR_CaptureVideo_Ogg_BeginVideo(void)
 		}
 		else
 		{
-			ti.target_bitrate = ti.target_bitrate;
 			ti.keyframe_data_target_bitrate = (int) (ti.target_bitrate * max(1, cl_capturevideo_ogg_theora_keyframe_bitrate_multiplier.value));
 
 			if(ti.target_bitrate < 45000 || ti.target_bitrate > 2000000)
 				Con_DPrintf("WARNING: requesting an odd bitrate for theora (sensible values range from 45 to 2000 kbps)\n");
 		}
 
-		if(ti.quality < 0)
+		if(ti.quality < 0 || ti.quality > 63)
 		{
 			ti.quality = 63;
 			if(ti.target_bitrate <= 0)
@@ -1031,10 +1030,6 @@ void SCR_CaptureVideo_Ogg_BeginVideo(void)
 				ti.keyframe_data_target_bitrate = 0x7FFFFFFF;
 			}
 		}
-		else
-		{
-			ti.quality = bound(0, ti.quality, 63);
-		}
 
 		// this -1 magic is because ti.keyframe_frequency and ti.keyframe_mindistance use different metrics
 		ti.keyframe_frequency = bound(1, cl_capturevideo_ogg_theora_keyframe_maxinterval.integer, 1000);