X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=cap_ogg.c;h=609947ca3d02a32fc6f23b7eff8daec98c18ef62;hb=eb650690a0e53f4b150fd00f2e6a52d092bcdff8;hp=ff4bfb60729690a0cb84e6f18063d87fec24c874;hpb=7540df05ff2b201346a80f16d73d657311a171e3;p=xonotic%2Fdarkplaces.git

diff --git a/cap_ogg.c b/cap_ogg.c
index ff4bfb60..609947ca 100644
--- a/cap_ogg.c
+++ b/cap_ogg.c
@@ -9,8 +9,8 @@
 
 // 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"};
-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"};
+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)"};
 static cvar_t cl_capturevideo_ogg_theora_keyframe_mininterval = {CVAR_SAVE, "cl_capturevideo_ogg_theora_keyframe_mininterval", "8", "minimum keyframe interval (1 to 1000)"};
@@ -847,7 +847,7 @@ static void SCR_CaptureVideo_Ogg_ConvertFrame_BGRA_to_YUV(void)
 			b += 4;
 		}
 
-		if((y & 1) == 0)
+		if ((y & 1) == 0 && y/2 < h/2) // if h is odd, this skips the last row
 		{
 			for(b = cls.capturevideo.outbuffer + (h-2-y)*w*4, x = 0; x < w/2; ++x)
 			{
@@ -1010,32 +1010,24 @@ void SCR_CaptureVideo_Ogg_BeginVideo(void)
 
 		if(ti.target_bitrate <= 0)
 		{
-			if(ti.quality < 0)
-			{
-				ti.target_bitrate = -1;
-				ti.keyframe_data_target_bitrate = (unsigned int)-1;
-				ti.quality = 63;
-			}
-			else
-			{
-				ti.target_bitrate = -1;
-				ti.keyframe_data_target_bitrate = (unsigned int)-1;
-				ti.quality = bound(0, ti.quality, 63);
-			}
+			ti.target_bitrate = -1;
+			ti.keyframe_data_target_bitrate = (unsigned int)-1;
 		}
 		else
 		{
-			if(ti.quality < 0)
-			{
-				ti.target_bitrate = bound(45000, ti.target_bitrate, 2000000);
-				ti.keyframe_data_target_bitrate = (int) (ti.target_bitrate * max(1, cl_capturevideo_ogg_theora_keyframe_bitrate_multiplier.value));
-				ti.quality = -1;
-			}
-			else
+			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 || ti.quality > 63)
+		{
+			ti.quality = 63;
+			if(ti.target_bitrate <= 0)
 			{
-				ti.target_bitrate = bound(45000, ti.target_bitrate, 2000000);
-				ti.keyframe_data_target_bitrate = (int) (ti.target_bitrate * max(1, cl_capturevideo_ogg_theora_keyframe_bitrate_multiplier.value));
-				ti.quality = -1;
+				ti.target_bitrate = 0x7FFFFFFF;
+				ti.keyframe_data_target_bitrate = 0x7FFFFFFF;
 			}
 		}