]> de.git.xonotic.org Git - xonotic/darkplaces.git/blobdiff - cl_screen.c
DP_QC_GETTIME_CDTRACK: extension to query the playing time of the current cd track.
[xonotic/darkplaces.git] / cl_screen.c
index 473d8a60c49b4171682edef7aa46ed70d09e0bc8..12426fd8f1bd40f72e362b89054f2c0562b856f5 100644 (file)
@@ -6,6 +6,8 @@
 #include "cl_collision.h"
 #include "libcurl.h"
 #include "csprogs.h"
+#include "cap_avi.h"
+#include "cap_ogg.h"
 
 // we have to include snd_main.h here only to get access to snd_renderbuffer->format.speed when writing the AVI headers
 #include "snd_main.h"
@@ -28,13 +30,17 @@ cvar_t vid_pixelheight = {CVAR_SAVE, "vid_pixelheight", "1", "adjusts vertical f
 cvar_t scr_screenshot_jpeg = {CVAR_SAVE, "scr_screenshot_jpeg","1", "save jpeg instead of targa"};
 cvar_t scr_screenshot_jpeg_quality = {CVAR_SAVE, "scr_screenshot_jpeg_quality","0.9", "image quality of saved jpeg"};
 cvar_t scr_screenshot_gammaboost = {CVAR_SAVE, "scr_screenshot_gammaboost","1", "gamma correction on saved screenshots and videos, 1.0 saves unmodified images"};
+cvar_t scr_screenshot_hwgamma = {CVAR_SAVE, "scr_screenshot_hwgamma","1", "apply the video gamma ramp to saved screenshots and videos"};
 // scr_screenshot_name is defined in fs.c
 cvar_t cl_capturevideo = {0, "cl_capturevideo", "0", "enables saving of video to a .avi file using uncompressed I420 colorspace and PCM audio, note that scr_screenshot_gammaboost affects the brightness of the output)"};
-cvar_t cl_capturevideo_width = {0, "cl_capturevideo_width", "0", "scales all frames to this resolution before saving the video"};
-cvar_t cl_capturevideo_height = {0, "cl_capturevideo_height", "0", "scales all frames to this resolution before saving the video"};
+cvar_t cl_capturevideo_printfps = {CVAR_SAVE, "cl_capturevideo_printfps", "1", "prints the frames per second captured in capturevideo (is only written to the log file, not to the console, as that would be visible on the video)"};
+cvar_t cl_capturevideo_width = {CVAR_SAVE, "cl_capturevideo_width", "0", "scales all frames to this resolution before saving the video"};
+cvar_t cl_capturevideo_height = {CVAR_SAVE, "cl_capturevideo_height", "0", "scales all frames to this resolution before saving the video"};
 cvar_t cl_capturevideo_realtime = {0, "cl_capturevideo_realtime", "0", "causes video saving to operate in realtime (mostly useful while playing, not while capturing demos), this can produce a much lower quality video due to poor sound/video sync and will abort saving if your machine stalls for over a minute"};
-cvar_t cl_capturevideo_fps = {0, "cl_capturevideo_fps", "30", "how many frames per second to save (29.97 for NTSC, 30 for typical PC video, 15 can be useful)"};
+cvar_t cl_capturevideo_fps = {CVAR_SAVE, "cl_capturevideo_fps", "30", "how many frames per second to save (29.97 for NTSC, 30 for typical PC video, 15 can be useful)"};
+cvar_t cl_capturevideo_nameformat = {CVAR_SAVE, "cl_capturevideo_nameformat", "dpvideo", "prefix for saved videos (the date is encoded using strftime escapes)"};
 cvar_t cl_capturevideo_number = {CVAR_SAVE, "cl_capturevideo_number", "1", "number to append to video filename, incremented each time a capture begins"};
+cvar_t cl_capturevideo_ogg = {CVAR_SAVE, "cl_capturevideo_ogg", "1", "save captured video data as Ogg/Vorbis/Theora streams"};
 cvar_t r_letterbox = {0, "r_letterbox", "0", "reduces vertical height of view to simulate a letterboxed movie effect (can be used by mods for cutscenes)"};
 cvar_t r_stereo_separation = {0, "r_stereo_separation", "4", "separation distance of eyes in the world (negative values are only useful for cross-eyed viewing)"};
 cvar_t r_stereo_sidebyside = {0, "r_stereo_sidebyside", "0", "side by side views for those who can't afford glasses but can afford eye strain (note: use a negative r_stereo_separation if you want cross-eyed viewing)"};
@@ -51,7 +57,9 @@ cvar_t scr_refresh = {0, "scr_refresh", "1", "allows you to completely shut off
 cvar_t shownetgraph = {CVAR_SAVE, "shownetgraph", "0", "shows a graph of packet sizes and other information, 0 = off, 1 = show client netgraph, 2 = show client and server netgraphs (when hosting a server)"};
 cvar_t cl_demo_mousegrab = {0, "cl_demo_mousegrab", "0", "Allows reading the mouse input while playing demos. Useful for camera mods developed in csqc. (0: never, 1: always)"};
 
-#define AVI_MASTER_INDEX_SIZE 640 // GB ought to be enough for anyone
+extern cvar_t r_glsl;
+extern cvar_t v_glslgamma;
+#define WANT_SCREENSHOT_HWGAMMA (scr_screenshot_hwgamma.integer && !(r_glsl.integer && v_glslgamma.integer))
 
 int jpeg_supported = false;
 
@@ -849,12 +857,16 @@ void CL_Screen_Init(void)
        Cvar_RegisterVariable (&scr_screenshot_jpeg);
        Cvar_RegisterVariable (&scr_screenshot_jpeg_quality);
        Cvar_RegisterVariable (&scr_screenshot_gammaboost);
+       Cvar_RegisterVariable (&scr_screenshot_hwgamma);
        Cvar_RegisterVariable (&cl_capturevideo);
+       Cvar_RegisterVariable (&cl_capturevideo_printfps);
        Cvar_RegisterVariable (&cl_capturevideo_width);
        Cvar_RegisterVariable (&cl_capturevideo_height);
        Cvar_RegisterVariable (&cl_capturevideo_realtime);
        Cvar_RegisterVariable (&cl_capturevideo_fps);
+       Cvar_RegisterVariable (&cl_capturevideo_nameformat);
        Cvar_RegisterVariable (&cl_capturevideo_number);
+       Cvar_RegisterVariable (&cl_capturevideo_ogg);
        Cvar_RegisterVariable (&r_letterbox);
        Cvar_RegisterVariable(&r_stereo_separation);
        Cvar_RegisterVariable(&r_stereo_sidebyside);
@@ -877,6 +889,8 @@ void CL_Screen_Init(void)
        Cmd_AddCommand ("envmap", R_Envmap_f, "render a cubemap (skybox) of the current scene");
        Cmd_AddCommand ("infobar", SCR_InfoBar_f, "display a text in the infobar (usage: infobar expiretime string)");
 
+       SCR_CaptureVideo_Ogg_Init();
+
        scr_initialized = true;
 }
 
@@ -888,33 +902,33 @@ SCR_ScreenShot_f
 void SCR_ScreenShot_f (void)
 {
        static int shotnumber;
-       static char oldname[MAX_QPATH];
-       char base[MAX_QPATH];
+       static char old_prefix_name[MAX_QPATH];
+       char prefix_name[MAX_QPATH];
        char filename[MAX_QPATH];
        unsigned char *buffer1;
        unsigned char *buffer2;
        unsigned char *buffer3;
        qboolean jpeg = (scr_screenshot_jpeg.integer != 0);
 
-       dpsnprintf (base, sizeof(base), "screenshots/%s", scr_screenshot_name.string);
+       dpsnprintf (prefix_name, sizeof(prefix_name), "%s", Sys_TimeString(scr_screenshot_name.string));
 
-       if (strcmp (oldname, scr_screenshot_name.string))
+       if (strcmp(old_prefix_name, prefix_name))
        {
-               dpsnprintf(oldname, sizeof(oldname), "%s", scr_screenshot_name.string);
+               dpsnprintf(old_prefix_name, sizeof(old_prefix_name), "%s", prefix_name );
                shotnumber = 0;
        }
 
        // find a file name to save it to
        for (;shotnumber < 1000000;shotnumber++)
-               if (!FS_SysFileExists(va("%s/%s%06d.tga", fs_gamedir, base, shotnumber)) && !FS_SysFileExists(va("%s/%s%06d.jpg", fs_gamedir, base, shotnumber)))
+               if (!FS_SysFileExists(va("%s/screenshots/%s%06d.tga", fs_gamedir, prefix_name, shotnumber)) && !FS_SysFileExists(va("%s/screenshots/%s%06d.jpg", fs_gamedir, prefix_name, shotnumber)))
                        break;
        if (shotnumber >= 1000000)
        {
-               Con_Print("SCR_ScreenShot_f: Couldn't create the image file\n");
+               Con_Print("Couldn't create the image file\n");
                return;
        }
 
-       dpsnprintf(filename, sizeof(filename), "%s%06d.%s", base, shotnumber, jpeg ? "jpg" : "tga");
+       dpsnprintf(filename, sizeof(filename), "screenshots/%s%06d.%s", prefix_name, shotnumber, jpeg ? "jpg" : "tga");
 
        buffer1 = (unsigned char *)Mem_Alloc(tempmempool, vid.width * vid.height * 3);
        buffer2 = (unsigned char *)Mem_Alloc(tempmempool, vid.width * vid.height * 3);
@@ -923,7 +937,7 @@ void SCR_ScreenShot_f (void)
        if (SCR_ScreenShot (filename, buffer1, buffer2, buffer3, 0, 0, vid.width, vid.height, false, false, false, jpeg, true))
                Con_Printf("Wrote %s\n", filename);
        else
-               Con_Printf("unable to write %s\n", filename);
+               Con_Printf("Unable to write %s\n", filename);
 
        Mem_Free (buffer1);
        Mem_Free (buffer2);
@@ -932,264 +946,11 @@ void SCR_ScreenShot_f (void)
        shotnumber++;
 }
 
-static void SCR_CaptureVideo_RIFF_Start(void)
-{
-       memset(&cls.capturevideo.riffbuffer, 0, sizeof(sizebuf_t));
-       cls.capturevideo.riffbuffer.maxsize = sizeof(cls.capturevideo.riffbufferdata);
-       cls.capturevideo.riffbuffer.data = cls.capturevideo.riffbufferdata;
-}
-
-static void SCR_CaptureVideo_RIFF_Flush(void)
-{
-       if (cls.capturevideo.riffbuffer.cursize > 0)
-       {
-               if (!FS_Write(cls.capturevideo.videofile, cls.capturevideo.riffbuffer.data, cls.capturevideo.riffbuffer.cursize))
-                       cls.capturevideo.error = true;
-               cls.capturevideo.riffbuffer.cursize = 0;
-               cls.capturevideo.riffbuffer.overflowed = false;
-       }
-}
-
-static void SCR_CaptureVideo_RIFF_WriteBytes(const unsigned char *data, size_t size)
-{
-       SCR_CaptureVideo_RIFF_Flush();
-       if (!FS_Write(cls.capturevideo.videofile, data, size))
-               cls.capturevideo.error = true;
-}
-
-static void SCR_CaptureVideo_RIFF_Write32(int n)
-{
-       if (cls.capturevideo.riffbuffer.cursize + 4 > cls.capturevideo.riffbuffer.maxsize)
-               SCR_CaptureVideo_RIFF_Flush();
-       MSG_WriteLong(&cls.capturevideo.riffbuffer, n);
-}
-
-static void SCR_CaptureVideo_RIFF_Write16(int n)
-{
-       if (cls.capturevideo.riffbuffer.cursize + 2 > cls.capturevideo.riffbuffer.maxsize)
-               SCR_CaptureVideo_RIFF_Flush();
-       MSG_WriteShort(&cls.capturevideo.riffbuffer, n);
-}
-
-static void SCR_CaptureVideo_RIFF_WriteFourCC(const char *chunkfourcc)
-{
-       if (cls.capturevideo.riffbuffer.cursize + (int)strlen(chunkfourcc) > cls.capturevideo.riffbuffer.maxsize)
-               SCR_CaptureVideo_RIFF_Flush();
-       MSG_WriteUnterminatedString(&cls.capturevideo.riffbuffer, chunkfourcc);
-}
-
-static void SCR_CaptureVideo_RIFF_WriteTerminatedString(const char *string)
-{
-       if (cls.capturevideo.riffbuffer.cursize + (int)strlen(string) > cls.capturevideo.riffbuffer.maxsize)
-               SCR_CaptureVideo_RIFF_Flush();
-       MSG_WriteString(&cls.capturevideo.riffbuffer, string);
-}
-
-static fs_offset_t SCR_CaptureVideo_RIFF_GetPosition(void)
-{
-       SCR_CaptureVideo_RIFF_Flush();
-       return FS_Tell(cls.capturevideo.videofile);
-}
-
-static void SCR_CaptureVideo_RIFF_Push(const char *chunkfourcc, const char *listtypefourcc)
-{
-       SCR_CaptureVideo_RIFF_WriteFourCC(chunkfourcc);
-       SCR_CaptureVideo_RIFF_Write32(0);
-       SCR_CaptureVideo_RIFF_Flush();
-       cls.capturevideo.riffstackstartoffset[cls.capturevideo.riffstacklevel++] = SCR_CaptureVideo_RIFF_GetPosition();
-       if (listtypefourcc)
-               SCR_CaptureVideo_RIFF_WriteFourCC(listtypefourcc);
-}
-
-static void SCR_CaptureVideo_RIFF_Pop(void)
-{
-       fs_offset_t offset;
-       int x;
-       unsigned char sizebytes[4];
-       // write out the chunk size and then return to the current file position
-       cls.capturevideo.riffstacklevel--;
-       offset = SCR_CaptureVideo_RIFF_GetPosition();
-       x = (int)(offset - (cls.capturevideo.riffstackstartoffset[cls.capturevideo.riffstacklevel]));
-       sizebytes[0] = (x) & 0xff;sizebytes[1] = (x >> 8) & 0xff;sizebytes[2] = (x >> 16) & 0xff;sizebytes[3] = (x >> 24) & 0xff;
-       FS_Seek(cls.capturevideo.videofile, -(x + 4), SEEK_END);
-       FS_Write(cls.capturevideo.videofile, sizebytes, 4);
-       FS_Seek(cls.capturevideo.videofile, 0, SEEK_END);
-       if (offset & 1)
-       {
-               unsigned char c = 0;
-               FS_Write(cls.capturevideo.videofile, &c, 1);
-       }
-}
-
-static void GrowBuf(sizebuf_t *buf, int extralen)
-{
-       if(buf->cursize + extralen > buf->maxsize)
-       {
-               int oldsize = buf->maxsize;
-               unsigned char *olddata;
-               olddata = buf->data;
-               buf->maxsize = max(buf->maxsize * 2, 4096);
-               buf->data = (unsigned char *) Mem_Alloc(tempmempool, buf->maxsize);
-               if(olddata)
-               {
-                       memcpy(buf->data, olddata, oldsize);
-                       Mem_Free(olddata);
-               }
-       }
-}
-
-static void SCR_CaptureVideo_RIFF_IndexEntry(const char *chunkfourcc, int chunksize, int flags)
-{
-       if (cls.capturevideo.riffstacklevel != 2)
-               Sys_Error("SCR_Capturevideo_RIFF_IndexEntry: RIFF stack level is %i (should be 2)\n", cls.capturevideo.riffstacklevel);
-       GrowBuf(&cls.capturevideo.riffindexbuffer, 16);
-       SCR_CaptureVideo_RIFF_Flush();
-       MSG_WriteUnterminatedString(&cls.capturevideo.riffindexbuffer, chunkfourcc);
-       MSG_WriteLong(&cls.capturevideo.riffindexbuffer, flags);
-       MSG_WriteLong(&cls.capturevideo.riffindexbuffer, (int)FS_Tell(cls.capturevideo.videofile) - cls.capturevideo.riffstackstartoffset[1]);
-       MSG_WriteLong(&cls.capturevideo.riffindexbuffer, chunksize);
-}
-
-static void SCR_CaptureVideo_RIFF_MakeIxChunk(const char *fcc, const char *dwChunkId, fs_offset_t masteridx_counter, int *masteridx_count, fs_offset_t masteridx_start)
-{
-       int nMatching;
-       int i;
-       fs_offset_t ix = SCR_CaptureVideo_RIFF_GetPosition();
-       fs_offset_t pos;
-
-       if(*masteridx_count >= AVI_MASTER_INDEX_SIZE)
-               return;
-
-       nMatching = 0; // go through index and enumerate them
-       for(i = 0; i < cls.capturevideo.riffindexbuffer.cursize; i += 16)
-               if(!memcmp(cls.capturevideo.riffindexbuffer.data + i, dwChunkId, 4))
-                       ++nMatching;
-
-       SCR_CaptureVideo_RIFF_Push(fcc, NULL);
-       SCR_CaptureVideo_RIFF_Write16(2); // wLongsPerEntry
-       SCR_CaptureVideo_RIFF_Write16(0x0100); // bIndexType=1, bIndexSubType=0
-       SCR_CaptureVideo_RIFF_Write32(nMatching); // nEntriesInUse
-       SCR_CaptureVideo_RIFF_WriteFourCC(dwChunkId); // dwChunkId
-       SCR_CaptureVideo_RIFF_Write32(cls.capturevideo.videofile_ix_movistart & (fs_offset_t) 0xFFFFFFFFu);
-       SCR_CaptureVideo_RIFF_Write32(((fs_offset_t) cls.capturevideo.videofile_ix_movistart) >> 32);
-       SCR_CaptureVideo_RIFF_Write32(0); // dwReserved
-
-       for(i = 0; i < cls.capturevideo.riffindexbuffer.cursize; i += 16)
-               if(!memcmp(cls.capturevideo.riffindexbuffer.data + i, dwChunkId, 4))
-               {
-                       unsigned int *p = (unsigned int *) (cls.capturevideo.riffindexbuffer.data + i);
-                       unsigned int flags = p[1];
-                       unsigned int rpos = p[2];
-                       unsigned int size = p[3];
-                       size &= ~0x80000000;
-                       if(!(flags & 0x10)) // no keyframe?
-                               size |= 0x80000000;
-                       SCR_CaptureVideo_RIFF_Write32(rpos + 8);
-                       SCR_CaptureVideo_RIFF_Write32(size);
-               }
-
-       SCR_CaptureVideo_RIFF_Pop();
-       pos = SCR_CaptureVideo_RIFF_GetPosition();
-       SCR_CaptureVideo_RIFF_Flush();
-
-       FS_Seek(cls.capturevideo.videofile, masteridx_start + 16 * *masteridx_count, SEEK_SET);
-       SCR_CaptureVideo_RIFF_Write32(ix & (fs_offset_t) 0xFFFFFFFFu);
-       SCR_CaptureVideo_RIFF_Write32(((fs_offset_t) ix) >> 32);
-       SCR_CaptureVideo_RIFF_Write32(pos - ix);
-       SCR_CaptureVideo_RIFF_Write32(nMatching);
-       SCR_CaptureVideo_RIFF_Flush();
-
-       FS_Seek(cls.capturevideo.videofile, masteridx_counter, SEEK_SET);
-       SCR_CaptureVideo_RIFF_Write32(++*masteridx_count);
-       SCR_CaptureVideo_RIFF_Flush();
-
-       FS_Seek(cls.capturevideo.videofile, 0, SEEK_END);
-}
-
-static void SCR_CaptureVideo_RIFF_Finish(qboolean final)
-{
-       // close the "movi" list
-       SCR_CaptureVideo_RIFF_Pop();
-       if(cls.capturevideo.videofile_ix_master_video_inuse_offset)
-               SCR_CaptureVideo_RIFF_MakeIxChunk("ix00", "00dc", cls.capturevideo.videofile_ix_master_video_inuse_offset, &cls.capturevideo.videofile_ix_master_video_inuse, cls.capturevideo.videofile_ix_master_video_start_offset);
-       if(cls.capturevideo.videofile_ix_master_audio_inuse_offset)
-               SCR_CaptureVideo_RIFF_MakeIxChunk("ix01", "01wb", cls.capturevideo.videofile_ix_master_audio_inuse_offset, &cls.capturevideo.videofile_ix_master_audio_inuse, cls.capturevideo.videofile_ix_master_audio_start_offset);
-       // write the idx1 chunk that we've been building while saving the frames (for old style players)
-       if(final && cls.capturevideo.videofile_firstchunkframes_offset)
-       // TODO replace index creating by OpenDML ix##/##ix/indx chunk so it works for more than one AVI part too
-       {
-               SCR_CaptureVideo_RIFF_Push("idx1", NULL);
-               SCR_CaptureVideo_RIFF_WriteBytes(cls.capturevideo.riffindexbuffer.data, cls.capturevideo.riffindexbuffer.cursize);
-               SCR_CaptureVideo_RIFF_Pop();
-       }
-       cls.capturevideo.riffindexbuffer.cursize = 0;
-       // pop the RIFF chunk itself
-       while (cls.capturevideo.riffstacklevel > 0)
-               SCR_CaptureVideo_RIFF_Pop();
-       SCR_CaptureVideo_RIFF_Flush();
-       if(cls.capturevideo.videofile_firstchunkframes_offset)
-       {
-               Con_DPrintf("Finishing first chunk (%d frames)\n", cls.capturevideo.frame);
-               FS_Seek(cls.capturevideo.videofile, cls.capturevideo.videofile_firstchunkframes_offset, SEEK_SET);
-               SCR_CaptureVideo_RIFF_Write32(cls.capturevideo.frame);
-               SCR_CaptureVideo_RIFF_Flush();
-               FS_Seek(cls.capturevideo.videofile, 0, SEEK_END);
-               cls.capturevideo.videofile_firstchunkframes_offset = 0;
-       }
-       else
-               Con_DPrintf("Finishing another chunk (%d frames)\n", cls.capturevideo.frame);
-}
-
-static void SCR_CaptureVideo_RIFF_OverflowCheck(int framesize)
-{
-       fs_offset_t cursize, curfilesize;
-       if (cls.capturevideo.riffstacklevel != 2)
-               Sys_Error("SCR_CaptureVideo_RIFF_OverflowCheck: chunk stack leakage!\n");
-       // check where we are in the file
-       SCR_CaptureVideo_RIFF_Flush();
-       cursize = SCR_CaptureVideo_RIFF_GetPosition() - cls.capturevideo.riffstackstartoffset[0];
-       curfilesize = SCR_CaptureVideo_RIFF_GetPosition();
-
-       // if this would overflow the windows limit of 1GB per RIFF chunk, we need
-       // to close the current RIFF chunk and open another for future frames
-       if (8 + cursize + framesize + cls.capturevideo.riffindexbuffer.cursize + 8 + cls.capturevideo.riffindexbuffer.cursize + 64 > 1<<30) // note that the Ix buffer takes less space... I just don't dare to / 2 here now... sorry, maybe later
-       {
-               SCR_CaptureVideo_RIFF_Finish(false);
-               // begin a new 1GB extended section of the AVI
-               SCR_CaptureVideo_RIFF_Push("RIFF", "AVIX");
-               SCR_CaptureVideo_RIFF_Push("LIST", "movi");
-               cls.capturevideo.videofile_ix_movistart = cls.capturevideo.riffstackstartoffset[1];
-       }
-}
-
-static void FindFraction(double val, int *num, int *denom, int denomMax)
-{
-       int i;
-       double bestdiff;
-       // initialize
-       bestdiff = fabs(val);
-       *num = 0;
-       *denom = 1;
-
-       for(i = 1; i <= denomMax; ++i)
-       {
-               int inum = (int) floor(0.5 + val * i);
-               double diff = fabs(val - inum / (double)i);
-               if(diff < bestdiff)
-               {
-                       bestdiff = diff;
-                       *num = inum;
-                       *denom = i;
-               }
-       }
-}
-
 void SCR_CaptureVideo_BeginVideo(void)
 {
-       double gamma, g, aspect;
-       int width = cl_capturevideo_width.integer, height = cl_capturevideo_height.integer;
-       int n, d;
+       double r, g, b;
        unsigned int i;
+       int width = cl_capturevideo_width.integer, height = cl_capturevideo_height.integer;
        if (cls.capturevideo.active)
                return;
        memset(&cls.capturevideo, 0, sizeof(cls.capturevideo));
@@ -1205,8 +966,6 @@ void SCR_CaptureVideo_BeginVideo(void)
        if(height < 2 || height > vid.height) // can't scale up
                height = vid.height;
 
-       aspect = vid.width / (vid.height * vid_pixelheight.value);
-
        // ensure it's all even; if not, scale down a little
        if(width % 1)
                --width;
@@ -1216,16 +975,17 @@ void SCR_CaptureVideo_BeginVideo(void)
        cls.capturevideo.width = width;
        cls.capturevideo.height = height;
        cls.capturevideo.active = true;
-       cls.capturevideo.starttime = realtime;
-       cls.capturevideo.framerate = bound(1, cl_capturevideo_fps.value, 1000);
+       cls.capturevideo.framerate = bound(1, cl_capturevideo_fps.value, 1001);
        cls.capturevideo.soundrate = S_GetSoundRate();
-       cls.capturevideo.frame = 0;
+       cls.capturevideo.soundchannels = S_GetSoundChannels();
+       cls.capturevideo.startrealtime = realtime;
+       cls.capturevideo.frame = cls.capturevideo.lastfpsframe = 0;
+       cls.capturevideo.starttime = cls.capturevideo.lastfpstime = Sys_DoubleTime();
        cls.capturevideo.soundsampleframe = 0;
        cls.capturevideo.realtime = cl_capturevideo_realtime.integer != 0;
        cls.capturevideo.screenbuffer = (unsigned char *)Mem_Alloc(tempmempool, vid.width * vid.height * 4);
        cls.capturevideo.outbuffer = (unsigned char *)Mem_Alloc(tempmempool, width * height * (4+4) + 18);
-       gamma = 1.0/scr_screenshot_gammaboost.value;
-       dpsnprintf(cls.capturevideo.basename, sizeof(cls.capturevideo.basename), "video/dpvideo%03i", cl_capturevideo_number.integer);
+       dpsnprintf(cls.capturevideo.basename, sizeof(cls.capturevideo.basename), "video/%s%03i", Sys_TimeString(cl_capturevideo_nameformat.string), cl_capturevideo_number.integer);
        Cvar_SetValueQuick(&cl_capturevideo_number, cl_capturevideo_number.integer + 1);
 
        /*
@@ -1245,229 +1005,61 @@ Y = R *  .299 + G *  .587 + B *  .114;
 Cb = R * -.169 + G * -.332 + B *  .500 + 128.;
 Cr = R *  .500 + G * -.419 + B * -.0813 + 128.;
 */
+
+       if(WANT_SCREENSHOT_HWGAMMA)
+       {
+               VID_BuildGammaTables(&cls.capturevideo.vidramp[0], 256);
+       }
+       else
+       {
+               // identity gamma table
+               BuildGammaTable16(1.0f, 1.0f, 1.0f, 0.0f, 1.0f, cls.capturevideo.vidramp, 256);
+               BuildGammaTable16(1.0f, 1.0f, 1.0f, 0.0f, 1.0f, cls.capturevideo.vidramp + 256, 256);
+               BuildGammaTable16(1.0f, 1.0f, 1.0f, 0.0f, 1.0f, cls.capturevideo.vidramp + 256*2, 256);
+       }
+       if(scr_screenshot_gammaboost.value != 1)
+       {
+               double igamma = 1 / scr_screenshot_gammaboost.value;
+               for (i = 0;i < 256 * 3;i++)
+                       cls.capturevideo.vidramp[i] = (unsigned short) (0.5 + pow(cls.capturevideo.vidramp[i] * (1.0 / 65535.0), igamma) * 65535.0);
+       }
+
        for (i = 0;i < 256;i++)
        {
-               g = 255*pow(i/255.0, gamma);
+               r = 255*cls.capturevideo.vidramp[i]/65535.0;
+               g = 255*cls.capturevideo.vidramp[i+256]/65535.0;
+               b = 255*cls.capturevideo.vidramp[i+512]/65535.0;
+               // NOTE: we have to round DOWN here, or integer overflows happen. Sorry for slightly wrong looking colors sometimes...
                // Y weights from RGB
-               cls.capturevideo.rgbtoyuvscaletable[0][0][i] = (short)(g *  0.299);
+               cls.capturevideo.rgbtoyuvscaletable[0][0][i] = (short)(r *  0.299);
                cls.capturevideo.rgbtoyuvscaletable[0][1][i] = (short)(g *  0.587);
-               cls.capturevideo.rgbtoyuvscaletable[0][2][i] = (short)(g *  0.114);
+               cls.capturevideo.rgbtoyuvscaletable[0][2][i] = (short)(b *  0.114);
                // Cb weights from RGB
-               cls.capturevideo.rgbtoyuvscaletable[1][0][i] = (short)(g * -0.169);
+               cls.capturevideo.rgbtoyuvscaletable[1][0][i] = (short)(r * -0.169);
                cls.capturevideo.rgbtoyuvscaletable[1][1][i] = (short)(g * -0.332);
-               cls.capturevideo.rgbtoyuvscaletable[1][2][i] = (short)(g *  0.500);
+               cls.capturevideo.rgbtoyuvscaletable[1][2][i] = (short)(b *  0.500);
                // Cr weights from RGB
-               cls.capturevideo.rgbtoyuvscaletable[2][0][i] = (short)(g *  0.500);
+               cls.capturevideo.rgbtoyuvscaletable[2][0][i] = (short)(r *  0.500);
                cls.capturevideo.rgbtoyuvscaletable[2][1][i] = (short)(g * -0.419);
-               cls.capturevideo.rgbtoyuvscaletable[2][2][i] = (short)(g * -0.0813);
+               cls.capturevideo.rgbtoyuvscaletable[2][2][i] = (short)(b * -0.0813);
                // range reduction of YCbCr to valid signal range
                cls.capturevideo.yuvnormalizetable[0][i] = 16 + i * (236-16) / 256;
                cls.capturevideo.yuvnormalizetable[1][i] = 16 + i * (240-16) / 256;
                cls.capturevideo.yuvnormalizetable[2][i] = 16 + i * (240-16) / 256;
        }
 
-       //if (cl_capturevideo_)
-       //{
-       //}
-       //else
-       {
-               cls.capturevideo.format = CAPTUREVIDEOFORMAT_AVI_I420;
-               cls.capturevideo.videofile = FS_OpenRealFile(va("%s.avi", cls.capturevideo.basename), "wb", false);
-               SCR_CaptureVideo_RIFF_Start();
-               // enclosing RIFF chunk (there can be multiple of these in >1GB files, the later ones are "AVIX" instead of "AVI " and have no header/stream info)
-               SCR_CaptureVideo_RIFF_Push("RIFF", "AVI ");
-               // AVI main header
-               SCR_CaptureVideo_RIFF_Push("LIST", "hdrl");
-               SCR_CaptureVideo_RIFF_Push("avih", NULL);
-               SCR_CaptureVideo_RIFF_Write32((int)(1000000.0 / cls.capturevideo.framerate)); // microseconds per frame
-               SCR_CaptureVideo_RIFF_Write32(0); // max bytes per second
-               SCR_CaptureVideo_RIFF_Write32(0); // padding granularity
-               SCR_CaptureVideo_RIFF_Write32(0x910); // flags (AVIF_HASINDEX | AVIF_ISINTERLEAVED | AVIF_TRUSTCKTYPE)
-               cls.capturevideo.videofile_firstchunkframes_offset = SCR_CaptureVideo_RIFF_GetPosition();
-               SCR_CaptureVideo_RIFF_Write32(0); // total frames
-               SCR_CaptureVideo_RIFF_Write32(0); // initial frames
-               if (cls.capturevideo.soundrate)
-                       SCR_CaptureVideo_RIFF_Write32(2); // number of streams
-               else
-                       SCR_CaptureVideo_RIFF_Write32(1); // number of streams
-               SCR_CaptureVideo_RIFF_Write32(0); // suggested buffer size
-               SCR_CaptureVideo_RIFF_Write32(width); // width
-               SCR_CaptureVideo_RIFF_Write32(height); // height
-               SCR_CaptureVideo_RIFF_Write32(0); // reserved[0]
-               SCR_CaptureVideo_RIFF_Write32(0); // reserved[1]
-               SCR_CaptureVideo_RIFF_Write32(0); // reserved[2]
-               SCR_CaptureVideo_RIFF_Write32(0); // reserved[3]
-               SCR_CaptureVideo_RIFF_Pop();
-               // video stream info
-               SCR_CaptureVideo_RIFF_Push("LIST", "strl");
-               SCR_CaptureVideo_RIFF_Push("strh", "vids");
-               SCR_CaptureVideo_RIFF_WriteFourCC("I420"); // stream fourcc (I420 colorspace, uncompressed)
-               SCR_CaptureVideo_RIFF_Write32(0); // flags
-               SCR_CaptureVideo_RIFF_Write16(0); // priority
-               SCR_CaptureVideo_RIFF_Write16(0); // language
-               SCR_CaptureVideo_RIFF_Write32(0); // initial frames
-               // find an ideal divisor for the framerate
-               FindFraction(cls.capturevideo.framerate, &n, &d, 1000);
-               SCR_CaptureVideo_RIFF_Write32(d); // samples/second divisor
-               SCR_CaptureVideo_RIFF_Write32(n); // samples/second multiplied by divisor
-               SCR_CaptureVideo_RIFF_Write32(0); // start
-               cls.capturevideo.videofile_totalframes_offset1 = SCR_CaptureVideo_RIFF_GetPosition();
-               SCR_CaptureVideo_RIFF_Write32(0); // length
-               SCR_CaptureVideo_RIFF_Write32(width*height+(width/2)*(height/2)*2); // suggested buffer size
-               SCR_CaptureVideo_RIFF_Write32(0); // quality
-               SCR_CaptureVideo_RIFF_Write32(0); // sample size
-               SCR_CaptureVideo_RIFF_Write16(0); // frame left
-               SCR_CaptureVideo_RIFF_Write16(0); // frame top
-               SCR_CaptureVideo_RIFF_Write16(width); // frame right
-               SCR_CaptureVideo_RIFF_Write16(height); // frame bottom
-               SCR_CaptureVideo_RIFF_Pop();
-               // video stream format
-               SCR_CaptureVideo_RIFF_Push("strf", NULL);
-               SCR_CaptureVideo_RIFF_Write32(40); // BITMAPINFO struct size
-               SCR_CaptureVideo_RIFF_Write32(width); // width
-               SCR_CaptureVideo_RIFF_Write32(height); // height
-               SCR_CaptureVideo_RIFF_Write16(3); // planes
-               SCR_CaptureVideo_RIFF_Write16(12); // bitcount
-               SCR_CaptureVideo_RIFF_WriteFourCC("I420"); // compression
-               SCR_CaptureVideo_RIFF_Write32(width*height+(width/2)*(height/2)*2); // size of image
-               SCR_CaptureVideo_RIFF_Write32(0); // x pixels per meter
-               SCR_CaptureVideo_RIFF_Write32(0); // y pixels per meter
-               SCR_CaptureVideo_RIFF_Write32(0); // color used
-               SCR_CaptureVideo_RIFF_Write32(0); // color important
-               SCR_CaptureVideo_RIFF_Pop();
-               // master index
-               SCR_CaptureVideo_RIFF_Push("indx", NULL);
-               SCR_CaptureVideo_RIFF_Write16(4); // wLongsPerEntry
-               SCR_CaptureVideo_RIFF_Write16(0); // bIndexSubType=0, bIndexType=0
-               cls.capturevideo.videofile_ix_master_video_inuse_offset = SCR_CaptureVideo_RIFF_GetPosition();
-               SCR_CaptureVideo_RIFF_Write32(0); // nEntriesInUse
-               SCR_CaptureVideo_RIFF_WriteFourCC("00dc"); // dwChunkId
-               SCR_CaptureVideo_RIFF_Write32(0); // dwReserved1
-               SCR_CaptureVideo_RIFF_Write32(0); // dwReserved2
-               SCR_CaptureVideo_RIFF_Write32(0); // dwReserved3
-               cls.capturevideo.videofile_ix_master_video_start_offset = SCR_CaptureVideo_RIFF_GetPosition();
-               for(i = 0; i < AVI_MASTER_INDEX_SIZE * 4; ++i)
-                       SCR_CaptureVideo_RIFF_Write32(0); // fill up later
-               SCR_CaptureVideo_RIFF_Pop();
-               // extended format (aspect!)
-               SCR_CaptureVideo_RIFF_Push("vprp", NULL);
-               SCR_CaptureVideo_RIFF_Write32(0); // VideoFormatToken
-               SCR_CaptureVideo_RIFF_Write32(0); // VideoStandard
-               SCR_CaptureVideo_RIFF_Write32((int)cls.capturevideo.framerate); // dwVerticalRefreshRate (bogus)
-               SCR_CaptureVideo_RIFF_Write32(width); // dwHTotalInT
-               SCR_CaptureVideo_RIFF_Write32(height); // dwVTotalInLines
-               FindFraction(aspect, &n, &d, 1000);
-               SCR_CaptureVideo_RIFF_Write32((n << 16) | d); // dwFrameAspectRatio // TODO a word
-               SCR_CaptureVideo_RIFF_Write32(width); // dwFrameWidthInPixels
-               SCR_CaptureVideo_RIFF_Write32(height); // dwFrameHeightInLines
-               SCR_CaptureVideo_RIFF_Write32(1); // nFieldPerFrame
-               SCR_CaptureVideo_RIFF_Write32(width); // CompressedBMWidth
-               SCR_CaptureVideo_RIFF_Write32(height); // CompressedBMHeight
-               SCR_CaptureVideo_RIFF_Write32(width); // ValidBMHeight
-               SCR_CaptureVideo_RIFF_Write32(height); // ValidBMWidth
-               SCR_CaptureVideo_RIFF_Write32(0); // ValidBMXOffset
-               SCR_CaptureVideo_RIFF_Write32(0); // ValidBMYOffset
-               SCR_CaptureVideo_RIFF_Write32(0); // ValidBMXOffsetInT
-               SCR_CaptureVideo_RIFF_Write32(0); // ValidBMYValidStartLine
-               SCR_CaptureVideo_RIFF_Pop();
-               SCR_CaptureVideo_RIFF_Pop();
-               if (cls.capturevideo.soundrate)
-               {
-                       // audio stream info
-                       SCR_CaptureVideo_RIFF_Push("LIST", "strl");
-                       SCR_CaptureVideo_RIFF_Push("strh", "auds");
-                       SCR_CaptureVideo_RIFF_Write32(1); // stream fourcc (PCM audio, uncompressed)
-                       SCR_CaptureVideo_RIFF_Write32(0); // flags
-                       SCR_CaptureVideo_RIFF_Write16(0); // priority
-                       SCR_CaptureVideo_RIFF_Write16(0); // language
-                       SCR_CaptureVideo_RIFF_Write32(0); // initial frames
-                       SCR_CaptureVideo_RIFF_Write32(1); // samples/second divisor
-                       SCR_CaptureVideo_RIFF_Write32((int)(cls.capturevideo.soundrate)); // samples/second multiplied by divisor
-                       SCR_CaptureVideo_RIFF_Write32(0); // start
-                       cls.capturevideo.videofile_totalsampleframes_offset = SCR_CaptureVideo_RIFF_GetPosition();
-                       SCR_CaptureVideo_RIFF_Write32(0); // length
-                       SCR_CaptureVideo_RIFF_Write32(cls.capturevideo.soundrate * 2); // suggested buffer size (this is a half second)
-                       SCR_CaptureVideo_RIFF_Write32(0); // quality
-                       SCR_CaptureVideo_RIFF_Write32(4); // sample size
-                       SCR_CaptureVideo_RIFF_Write16(0); // frame left
-                       SCR_CaptureVideo_RIFF_Write16(0); // frame top
-                       SCR_CaptureVideo_RIFF_Write16(0); // frame right
-                       SCR_CaptureVideo_RIFF_Write16(0); // frame bottom
-                       SCR_CaptureVideo_RIFF_Pop();
-                       // audio stream format
-                       SCR_CaptureVideo_RIFF_Push("strf", NULL);
-                       SCR_CaptureVideo_RIFF_Write16(1); // format (uncompressed PCM?)
-                       SCR_CaptureVideo_RIFF_Write16(2); // channels (stereo)
-                       SCR_CaptureVideo_RIFF_Write32(cls.capturevideo.soundrate); // sampleframes per second
-                       SCR_CaptureVideo_RIFF_Write32(cls.capturevideo.soundrate * 4); // average bytes per second
-                       SCR_CaptureVideo_RIFF_Write16(4); // block align
-                       SCR_CaptureVideo_RIFF_Write16(16); // bits per sample
-                       SCR_CaptureVideo_RIFF_Write16(0); // size
-                       SCR_CaptureVideo_RIFF_Pop();
-                       // master index
-                       SCR_CaptureVideo_RIFF_Push("indx", NULL);
-                       SCR_CaptureVideo_RIFF_Write16(4); // wLongsPerEntry
-                       SCR_CaptureVideo_RIFF_Write16(0); // bIndexSubType=0, bIndexType=0
-                       cls.capturevideo.videofile_ix_master_audio_inuse_offset = SCR_CaptureVideo_RIFF_GetPosition();
-                       SCR_CaptureVideo_RIFF_Write32(0); // nEntriesInUse
-                       SCR_CaptureVideo_RIFF_WriteFourCC("01wb"); // dwChunkId
-                       SCR_CaptureVideo_RIFF_Write32(0); // dwReserved1
-                       SCR_CaptureVideo_RIFF_Write32(0); // dwReserved2
-                       SCR_CaptureVideo_RIFF_Write32(0); // dwReserved3
-                       cls.capturevideo.videofile_ix_master_audio_start_offset = SCR_CaptureVideo_RIFF_GetPosition();
-                       for(i = 0; i < AVI_MASTER_INDEX_SIZE * 4; ++i)
-                               SCR_CaptureVideo_RIFF_Write32(0); // fill up later
-                       SCR_CaptureVideo_RIFF_Pop();
-                       SCR_CaptureVideo_RIFF_Pop();
-               }
-
-               cls.capturevideo.videofile_ix_master_audio_inuse = cls.capturevideo.videofile_ix_master_video_inuse = 0;
-
-               // extended header (for total #frames)
-               SCR_CaptureVideo_RIFF_Push("LIST", "odml");
-               SCR_CaptureVideo_RIFF_Push("dmlh", NULL);
-               cls.capturevideo.videofile_totalframes_offset2 = SCR_CaptureVideo_RIFF_GetPosition();
-               SCR_CaptureVideo_RIFF_Write32(0);
-               SCR_CaptureVideo_RIFF_Pop();
-               SCR_CaptureVideo_RIFF_Pop();
-
-               // close the AVI header list
-               SCR_CaptureVideo_RIFF_Pop();
-               // software that produced this AVI video file
-               SCR_CaptureVideo_RIFF_Push("LIST", "INFO");
-               SCR_CaptureVideo_RIFF_Push("ISFT", NULL);
-               SCR_CaptureVideo_RIFF_WriteTerminatedString(engineversion);
-               SCR_CaptureVideo_RIFF_Pop();
-               // enable this junk filler if you like the LIST movi to always begin at 4KB in the file (why?)
-#if 0
-               SCR_CaptureVideo_RIFF_Push("JUNK", NULL);
-               x = 4096 - SCR_CaptureVideo_RIFF_GetPosition();
-               while (x > 0)
+       if (cl_capturevideo_ogg.integer)
+       {
+               if(SCR_CaptureVideo_Ogg_Available())
                {
-                       const char *junkfiller = "[ DarkPlaces junk data ]";
-                       int i = min(x, (int)strlen(junkfiller));
-                       SCR_CaptureVideo_RIFF_WriteBytes((const unsigned char *)junkfiller, i);
-                       x -= i;
+                       SCR_CaptureVideo_Ogg_BeginVideo();
+                       return;
                }
-               SCR_CaptureVideo_RIFF_Pop();
-#endif
-               SCR_CaptureVideo_RIFF_Pop();
-               // begin the actual video section now
-               SCR_CaptureVideo_RIFF_Push("LIST", "movi");
-               cls.capturevideo.videofile_ix_movistart = cls.capturevideo.riffstackstartoffset[1];
-               // we're done with the headers now...
-               SCR_CaptureVideo_RIFF_Flush();
-               if (cls.capturevideo.riffstacklevel != 2)
-                       Sys_Error("SCR_CaptureVideo_BeginVideo: broken AVI writing code (stack level is %i (should be 2) at end of headers)\n", cls.capturevideo.riffstacklevel);
+               else
+                       Con_Print("cl_capturevideo_ogg: libraries not available. Capturing in AVI instead.\n");
        }
 
-       switch(cls.capturevideo.format)
-       {
-       case CAPTUREVIDEOFORMAT_AVI_I420:
-               break;
-       default:
-               break;
-       }
+       SCR_CaptureVideo_Avi_BeginVideo();
 }
 
 void SCR_CaptureVideo_EndVideo(void)
@@ -1475,33 +1067,12 @@ void SCR_CaptureVideo_EndVideo(void)
        if (!cls.capturevideo.active)
                return;
        cls.capturevideo.active = false;
+
+       Con_Printf("Finishing capture of %s.%s (%d frames, %d audio frames)\n", cls.capturevideo.basename, cls.capturevideo.formatextension, cls.capturevideo.frame, cls.capturevideo.soundsampleframe);
+
        if (cls.capturevideo.videofile)
        {
-               switch(cls.capturevideo.format)
-               {
-               case CAPTUREVIDEOFORMAT_AVI_I420:
-                       // close any open chunks
-                       SCR_CaptureVideo_RIFF_Finish(true);
-                       // go back and fix the video frames and audio samples fields
-                       Con_DPrintf("Finishing capture (%d frames, %d audio frames)\n", cls.capturevideo.frame, cls.capturevideo.soundsampleframe);
-                       FS_Seek(cls.capturevideo.videofile, cls.capturevideo.videofile_totalframes_offset1, SEEK_SET);
-                       SCR_CaptureVideo_RIFF_Write32(cls.capturevideo.frame);
-                       SCR_CaptureVideo_RIFF_Flush();
-                       FS_Seek(cls.capturevideo.videofile, cls.capturevideo.videofile_totalframes_offset2, SEEK_SET);
-                       SCR_CaptureVideo_RIFF_Write32(cls.capturevideo.frame);
-                       SCR_CaptureVideo_RIFF_Flush();
-                       if (cls.capturevideo.soundrate)
-                       {
-                               FS_Seek(cls.capturevideo.videofile, cls.capturevideo.videofile_totalsampleframes_offset, SEEK_SET);
-                               SCR_CaptureVideo_RIFF_Write32(cls.capturevideo.soundsampleframe);
-                               SCR_CaptureVideo_RIFF_Flush();
-                       }
-                       break;
-               default:
-                       break;
-               }
-               FS_Close(cls.capturevideo.videofile);
-               cls.capturevideo.videofile = NULL;
+               cls.capturevideo.endvideo();
        }
 
        if (cls.capturevideo.screenbuffer)
@@ -1516,51 +1087,9 @@ void SCR_CaptureVideo_EndVideo(void)
                cls.capturevideo.outbuffer = NULL;
        }
 
-       if (cls.capturevideo.riffindexbuffer.data)
-       {
-               Mem_Free(cls.capturevideo.riffindexbuffer.data);
-               cls.capturevideo.riffindexbuffer.data = NULL;
-       }
-
        memset(&cls.capturevideo, 0, sizeof(cls.capturevideo));
 }
 
-// converts from BGRA32 to I420 colorspace (identical to YV12 except chroma plane order is reversed), this colorspace is handled by the Intel(r) 4:2:0 codec on Windows
-void SCR_CaptureVideo_ConvertFrame_BGRA_to_I420_flip(int width, int height, unsigned char *instart, unsigned char *outstart)
-{
-       int x, y;
-       int blockr, blockg, blockb;
-       int outoffset = (width/2)*(height/2);
-       unsigned char *b, *out;
-       // process one line at a time, and CbCr every other line at 2 pixel intervals
-       for (y = 0;y < height;y++)
-       {
-               // 1x1 Y
-               for (b = instart + (height-1-y)*width*4, out = outstart + y*width, x = 0;x < width;x++, b += 4, out++)
-               {
-                       blockr = b[2];
-                       blockg = b[1];
-                       blockb = b[0];
-                       *out = cls.capturevideo.yuvnormalizetable[0][cls.capturevideo.rgbtoyuvscaletable[0][0][blockr] + cls.capturevideo.rgbtoyuvscaletable[0][1][blockg] + cls.capturevideo.rgbtoyuvscaletable[0][2][blockb]];
-               }
-               if ((y & 1) == 0)
-               {
-                       // 2x2 Cr and Cb planes
-                       int inpitch = width*4;
-                       for (b = instart + (height-2-y)*width*4, out = outstart + width*height + (y/2)*(width/2), x = 0;x < width/2;x++, b += 8, out++)
-                       {
-                               blockr = (b[2] + b[6] + b[inpitch+2] + b[inpitch+6]) >> 2;
-                               blockg = (b[1] + b[5] + b[inpitch+1] + b[inpitch+5]) >> 2;
-                               blockb = (b[0] + b[4] + b[inpitch+0] + b[inpitch+4]) >> 2;
-                               // Cr
-                               out[0        ] = cls.capturevideo.yuvnormalizetable[1][cls.capturevideo.rgbtoyuvscaletable[1][0][blockr] + cls.capturevideo.rgbtoyuvscaletable[1][1][blockg] + cls.capturevideo.rgbtoyuvscaletable[1][2][blockb] + 128];
-                               // Cb
-                               out[outoffset] = cls.capturevideo.yuvnormalizetable[2][cls.capturevideo.rgbtoyuvscaletable[2][0][blockr] + cls.capturevideo.rgbtoyuvscaletable[2][1][blockg] + cls.capturevideo.rgbtoyuvscaletable[2][2][blockb] + 128];
-                       }
-               }
-       }
-}
-
 static void SCR_ScaleDownBGRA(unsigned char *in, int inw, int inh, unsigned char *out, int outw, int outh)
 {
        // TODO optimize this function
@@ -1609,58 +1138,41 @@ static void SCR_ScaleDownBGRA(unsigned char *in, int inw, int inh, unsigned char
        }
 }
 
-qboolean SCR_CaptureVideo_VideoFrame(int newframenum)
+void SCR_CaptureVideo_VideoFrame(int newframenum)
 {
-       int x = 0, y = 0, width = cls.capturevideo.width, height = cls.capturevideo.height;
-       unsigned char *in, *out;
+       int x = 0, y = 0;
+       int width = cls.capturevideo.width, height = cls.capturevideo.height;
+
        CHECKGLERROR
        //return SCR_ScreenShot(filename, cls.capturevideo.buffer, cls.capturevideo.buffer + vid.width * vid.height * 3, cls.capturevideo.buffer + vid.width * vid.height * 6, 0, 0, vid.width, vid.height, false, false, false, jpeg, true);
        // speed is critical here, so do saving as directly as possible
-       switch (cls.capturevideo.format)
-       {
-       case CAPTUREVIDEOFORMAT_AVI_I420:
-               // if there's no videofile we have to just give up, and abort saving
-               if (!cls.capturevideo.videofile)
-                       return false;
-               // FIXME: width/height must be multiple of 2, enforce this?
-               qglReadPixels (x, y, vid.width, vid.height, GL_BGRA, GL_UNSIGNED_BYTE, cls.capturevideo.screenbuffer);CHECKGLERROR
-               SCR_ScaleDownBGRA (cls.capturevideo.screenbuffer, vid.width, vid.height, cls.capturevideo.outbuffer, width, height);
-               in = cls.capturevideo.outbuffer;
-               out = cls.capturevideo.outbuffer + width*height*4;
-               SCR_CaptureVideo_ConvertFrame_BGRA_to_I420_flip(width, height, in, out);
-               x = width*height+(width/2)*(height/2)*2;
-               SCR_CaptureVideo_RIFF_OverflowCheck(8 + x);
-               for (;cls.capturevideo.frame < newframenum;cls.capturevideo.frame++)
+
+       qglReadPixels (x, y, vid.width, vid.height, GL_BGRA, GL_UNSIGNED_BYTE, cls.capturevideo.screenbuffer);CHECKGLERROR
+       SCR_ScaleDownBGRA (cls.capturevideo.screenbuffer, vid.width, vid.height, cls.capturevideo.outbuffer, width, height);
+
+       cls.capturevideo.videoframes(newframenum - cls.capturevideo.frame);
+       cls.capturevideo.frame = newframenum;
+
+       if(cl_capturevideo_printfps.integer)
+       {
+               char buf[80];
+               double t = Sys_DoubleTime();
+               if(t > cls.capturevideo.lastfpstime + 1)
                {
-                       SCR_CaptureVideo_RIFF_IndexEntry("00dc", x, 0x10); // AVIIF_KEYFRAME
-                       SCR_CaptureVideo_RIFF_Push("00dc", NULL);
-                       SCR_CaptureVideo_RIFF_WriteBytes(out, x);
-                       SCR_CaptureVideo_RIFF_Pop();
+                       double fps1 = (cls.capturevideo.frame - cls.capturevideo.lastfpsframe) / (t - cls.capturevideo.lastfpstime + 0.0000001);
+                       double fps  = (cls.capturevideo.frame                                ) / (t - cls.capturevideo.starttime   + 0.0000001);
+                       dpsnprintf(buf, sizeof(buf), "capturevideo: (%.1fs) last second %.3ffps, total %.3ffps\n", cls.capturevideo.frame / cls.capturevideo.framerate, fps1, fps);
+                       Sys_PrintToTerminal(buf);
+                       cls.capturevideo.lastfpstime = t;
+                       cls.capturevideo.lastfpsframe = cls.capturevideo.frame;
                }
-               return true;
-       default:
-               return false;
        }
 }
 
-void SCR_CaptureVideo_SoundFrame(unsigned char *bufstereo16le, size_t length, int rate)
+void SCR_CaptureVideo_SoundFrame(const portable_sampleframe_t *paintbuffer, size_t length)
 {
-       int x;
-       cls.capturevideo.soundrate = rate;
        cls.capturevideo.soundsampleframe += length;
-       switch (cls.capturevideo.format)
-       {
-       case CAPTUREVIDEOFORMAT_AVI_I420:
-               x = length*4;
-               SCR_CaptureVideo_RIFF_OverflowCheck(8 + x);
-               SCR_CaptureVideo_RIFF_IndexEntry("01wb", x, 0x10); // AVIIF_KEYFRAME
-               SCR_CaptureVideo_RIFF_Push("01wb", NULL);
-               SCR_CaptureVideo_RIFF_WriteBytes(bufstereo16le, x);
-               SCR_CaptureVideo_RIFF_Pop();
-               break;
-       default:
-               break;
-       }
+       cls.capturevideo.soundframe(paintbuffer, length);
 }
 
 void SCR_CaptureVideo(void)
@@ -1681,7 +1193,7 @@ void SCR_CaptureVideo(void)
                if (cls.capturevideo.realtime)
                {
                        // preserve sound sync by duplicating frames when running slow
-                       newframenum = (int)((realtime - cls.capturevideo.starttime) * cls.capturevideo.framerate);
+                       newframenum = (int)((realtime - cls.capturevideo.startrealtime) * cls.capturevideo.framerate);
                }
                else
                        newframenum = cls.capturevideo.frame + 1;
@@ -1886,15 +1398,33 @@ qboolean SCR_ScreenShot(char *filename, unsigned char *buffer1, unsigned char *b
        CHECKGLERROR
        qglReadPixels (x, y, width, height, jpeg ? GL_RGB : GL_BGR, GL_UNSIGNED_BYTE, buffer1);CHECKGLERROR
 
-       if (scr_screenshot_gammaboost.value != 1 && gammacorrect)
+       if(gammacorrect && (scr_screenshot_gammaboost.value != 1 || WANT_SCREENSHOT_HWGAMMA))
        {
                int i;
                double igamma = 1.0 / scr_screenshot_gammaboost.value;
-               unsigned char ramp[256];
-               for (i = 0;i < 256;i++)
-                       ramp[i] = (unsigned char) (pow(i * (1.0 / 255.0), igamma) * 255.0);
-               for (i = 0;i < width*height*3;i++)
-                       buffer1[i] = ramp[buffer1[i]];
+               unsigned short vidramp[256 * 3];
+               if(WANT_SCREENSHOT_HWGAMMA)
+               {
+                       VID_BuildGammaTables(&vidramp[0], 256);
+               }
+               else
+               {
+                       // identity gamma table
+                       BuildGammaTable16(1.0f, 1.0f, 1.0f, 0.0f, 1.0f, vidramp, 256);
+                       BuildGammaTable16(1.0f, 1.0f, 1.0f, 0.0f, 1.0f, vidramp + 256, 256);
+                       BuildGammaTable16(1.0f, 1.0f, 1.0f, 0.0f, 1.0f, vidramp + 256*2, 256);
+               }
+               if(scr_screenshot_gammaboost.value != 1)
+               {
+                       for (i = 0;i < 256 * 3;i++)
+                               vidramp[i] = (unsigned short) (0.5 + pow(vidramp[i] * (1.0 / 65535.0), igamma) * 65535.0);
+               }
+               for (i = 0;i < width*height*3;i += 3)
+               {
+                       buffer1[i] = (unsigned char) (vidramp[buffer1[i]] * 255.0 / 65535.0 + 0.5);
+                       buffer1[i+1] = (unsigned char) (vidramp[buffer1[i+1] + 256] * 255.0 / 65535.0 + 0.5);
+                       buffer1[i+2] = (unsigned char) (vidramp[buffer1[i+2] + 512] * 255.0 / 65535.0 + 0.5);
+               }
        }
 
        Image_CopyMux (buffer2, buffer1, width, height, flipx, flipy, flipdiagonal, 3, 3, indices);
@@ -2080,15 +1610,206 @@ void SCR_DrawScreen (void)
        R_Mesh_Finish();
 }
 
-void SCR_UpdateLoadingScreen (qboolean clear)
+typedef struct loadingscreenstack_s
 {
-       float x, y;
-       cachepic_t *pic;
-       float vertex3f[12];
-       float texcoord2f[8];
-       // don't do anything if not initialized yet
-       if (vid_hidden || !scr_refresh.integer)
+       struct loadingscreenstack_s *prev;
+       char msg[MAX_QPATH];
+       float absolute_loading_amount_min; // this corresponds to relative completion 0 of this item
+       float absolute_loading_amount_len; // this corresponds to relative completion 1 of this item
+       float relative_completion; // 0 .. 1
+}
+loadingscreenstack_t;
+static loadingscreenstack_t *loadingscreenstack = NULL;
+static double loadingscreentime = -1;
+static qboolean loadingscreencleared = false;
+static float loadingscreenheight = 0;
+rtexture_t *loadingscreentexture = NULL;
+static float loadingscreentexture_vertex3f[12];
+static float loadingscreentexture_texcoord2f[8];
+
+static void SCR_ClearLoadingScreenTexture()
+{
+       if(loadingscreentexture)
+               R_FreeTexture(loadingscreentexture);
+       loadingscreentexture = NULL;
+}
+
+extern rtexturepool_t *r_main_texturepool;
+static void SCR_SetLoadingScreenTexture()
+{
+       int w, h;
+       float loadingscreentexture_w;
+       float loadingscreentexture_h;
+
+       SCR_ClearLoadingScreenTexture();
+
+       if (gl_support_arb_texture_non_power_of_two)
+       {
+               w = vid.width; h = vid.height;
+               loadingscreentexture_w = loadingscreentexture_h = 1;
+       }
+       else
+       {
+               w = CeilPowerOf2(vid.width); h = CeilPowerOf2(vid.height);
+               loadingscreentexture_w = vid.width / (float) w;
+               loadingscreentexture_h = vid.height / (float) h;
+       }
+
+       loadingscreentexture = R_LoadTexture2D(r_main_texturepool, "loadingscreentexture", w, h, NULL, TEXTYPE_BGRA, TEXF_FORCENEAREST | TEXF_CLAMP | TEXF_ALWAYSPRECACHE, NULL);
+       R_Mesh_TexBind(0, R_GetTexture(loadingscreentexture));
+       GL_ActiveTexture(0);
+       CHECKGLERROR
+       qglCopyTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, 0, 0, vid.width, vid.height);CHECKGLERROR
+
+       loadingscreentexture_vertex3f[2] = loadingscreentexture_vertex3f[5] = loadingscreentexture_vertex3f[8] = loadingscreentexture_vertex3f[11] = 0;
+       loadingscreentexture_vertex3f[0] = loadingscreentexture_vertex3f[9] = 0;
+       loadingscreentexture_vertex3f[1] = loadingscreentexture_vertex3f[4] = 0;
+       loadingscreentexture_vertex3f[3] = loadingscreentexture_vertex3f[6] = vid_conwidth.integer;
+       loadingscreentexture_vertex3f[7] = loadingscreentexture_vertex3f[10] = vid_conheight.integer;
+       loadingscreentexture_texcoord2f[0] = 0;loadingscreentexture_texcoord2f[1] = loadingscreentexture_h;
+       loadingscreentexture_texcoord2f[2] = loadingscreentexture_w;loadingscreentexture_texcoord2f[3] = loadingscreentexture_h;
+       loadingscreentexture_texcoord2f[4] = loadingscreentexture_w;loadingscreentexture_texcoord2f[5] = 0;
+       loadingscreentexture_texcoord2f[6] = 0;loadingscreentexture_texcoord2f[7] = 0;
+}
+
+void SCR_UpdateLoadingScreenIfShown()
+{
+       if(realtime == loadingscreentime)
+               SCR_UpdateLoadingScreen(loadingscreencleared);
+}
+
+void SCR_PushLoadingScreen (qboolean redraw, const char *msg, float len_in_parent)
+{
+       loadingscreenstack_t *s = (loadingscreenstack_t *) Z_Malloc(sizeof(loadingscreenstack_t));
+       s->prev = loadingscreenstack;
+       loadingscreenstack = s;
+
+       strlcpy(s->msg, msg, sizeof(s->msg));
+       s->relative_completion = 0;
+
+       if(s->prev)
+       {
+               s->absolute_loading_amount_min = s->prev->absolute_loading_amount_min + s->prev->absolute_loading_amount_len * s->prev->relative_completion;
+               s->absolute_loading_amount_len = s->prev->absolute_loading_amount_len * len_in_parent;
+               if(s->absolute_loading_amount_len > s->prev->absolute_loading_amount_min + s->prev->absolute_loading_amount_len - s->absolute_loading_amount_min)
+                       s->absolute_loading_amount_len = s->prev->absolute_loading_amount_min + s->prev->absolute_loading_amount_len - s->absolute_loading_amount_min;
+       }
+       else
+       {
+               s->absolute_loading_amount_min = 0;
+               s->absolute_loading_amount_len = 1;
+       }
+
+       if(redraw)
+               SCR_UpdateLoadingScreenIfShown();
+}
+
+void SCR_PopLoadingScreen (qboolean redraw)
+{
+       loadingscreenstack_t *s = loadingscreenstack;
+
+       if(!s)
+       {
+               Con_DPrintf("Popping a loading screen item from an empty stack!\n");
                return;
+       }
+
+       loadingscreenstack = s->prev;
+       if(s->prev)
+               s->prev->relative_completion = (s->absolute_loading_amount_min + s->absolute_loading_amount_len - s->prev->absolute_loading_amount_min) / s->prev->absolute_loading_amount_len;
+       Z_Free(s);
+
+       if(redraw)
+               SCR_UpdateLoadingScreenIfShown();
+}
+
+void SCR_ClearLoadingScreen (qboolean redraw)
+{
+       while(loadingscreenstack)
+               SCR_PopLoadingScreen(redraw && !loadingscreenstack->prev);
+}
+
+static float SCR_DrawLoadingStack_r(loadingscreenstack_t *s, float y)
+{
+       float size = 8;
+       float x;
+       size_t len;
+       float total;
+
+       total = 0;
+#if 0
+       if(s)
+       {
+               total += SCR_DrawLoadingStack_r(s->prev, y);
+               y -= total;
+               if(!s->prev || strcmp(s->msg, s->prev->msg))
+               {
+                       len = strlen(s->msg);
+                       x = (vid_conwidth.integer - DrawQ_TextWidth_Font(s->msg, len, true, FONT_INFOBAR) * size) / 2;
+                       y -= size;
+                       DrawQ_Fill(0, y, vid_conwidth.integer, size, 0, 0, 0, 1, 0);
+                       DrawQ_String_Font(x, y, s->msg, len, size, size, 1, 1, 1, 1, 0, NULL, true, FONT_INFOBAR);
+                       total += size;
+               }
+       }
+#else
+       if(s)
+       {
+               len = strlen(s->msg);
+               x = (vid_conwidth.integer - DrawQ_TextWidth_Font(s->msg, len, true, FONT_INFOBAR) * size) / 2;
+               y -= size;
+               DrawQ_Fill(0, y, vid_conwidth.integer, size, 0, 0, 0, 1, 0);
+               DrawQ_String_Font(x, y, s->msg, len, size, size, 1, 1, 1, 1, 0, NULL, true, FONT_INFOBAR);
+               total += size;
+       }
+#endif
+       return total;
+}
+
+static void SCR_DrawLoadingStack()
+{
+       float verts[12];
+       float colors[16];
+       int i;
+
+       loadingscreenheight = SCR_DrawLoadingStack_r(loadingscreenstack, vid_conheight.integer);
+       if(loadingscreenstack)
+       {
+               // height = 32; // sorry, using the actual one is ugly
+               GL_BlendFunc(GL_SRC_ALPHA, GL_ONE);
+               GL_DepthRange(0, 1);
+               GL_PolygonOffset(0, 0);
+               GL_DepthTest(false);
+               R_Mesh_VertexPointer(verts, 0, 0);
+               R_Mesh_ColorPointer(colors, 0, 0);
+               R_Mesh_ResetTextureState();
+               R_SetupGenericShader(false);
+               verts[2] = verts[5] = verts[8] = verts[11] = 0;
+               verts[0] = verts[9] = 0;
+               verts[1] = verts[4] = vid_conheight.integer - 8;
+               verts[3] = verts[6] = vid_conwidth.integer * loadingscreenstack->absolute_loading_amount_min;
+               verts[7] = verts[10] = vid_conheight.integer;
+
+               for(i = 0; i < 16; ++i)
+                       colors[i] = (i % 4 == 3) ? 1 : (i >= 8 && i % 4 == 2) ? 1 : 0;
+                       //                                        ^^^^^^^^^^ blue component
+                       //                              ^^^^^^ bottom row
+                       //          ^^^^^^^^^^^^ alpha is always on
+               R_Mesh_Draw(0, 4, 0, 2, NULL, polygonelements, 0, 0);
+
+               // make sure everything is cleared, including the progress indicator
+               if(loadingscreenheight < 8)
+                       loadingscreenheight = 8;
+       }
+}
+
+static cachepic_t *loadingscreenpic;
+static float loadingscreenpic_vertex3f[12];
+static float loadingscreenpic_texcoord2f[8];
+
+static void SCR_DrawLoadingScreen_SharedSetup (qboolean clear)
+{
+       float x, y;
        // release mouse grab while loading
        if (!vid.fullscreen)
                VID_SetMouse(false, false, false);
@@ -2100,59 +1821,110 @@ void SCR_UpdateLoadingScreen (qboolean clear)
        qglClearColor(0,0,0,0);CHECKGLERROR
        // when starting up a new video mode, make sure the screen is cleared to black
        if (clear)
-       {
                qglClear(GL_COLOR_BUFFER_BIT);CHECKGLERROR
-       }
-       //qglDisable(GL_CULL_FACE);CHECKGLERROR
-       //R_ClearScreen();
        R_Textures_Frame();
        GL_SetupView_Mode_Ortho(0, 0, vid_conwidth.integer, vid_conheight.integer, -10, 100);
        R_Mesh_Start();
        R_Mesh_Matrix(&identitymatrix);
        // draw the loading plaque
-       pic = Draw_CachePic ("gfx/loading");
-       x = (vid_conwidth.integer - pic->width)/2;
-       y = (vid_conheight.integer - pic->height)/2;
+       loadingscreenpic = Draw_CachePic ("gfx/loading");
+       x = (vid_conwidth.integer - loadingscreenpic->width)/2;
+       y = (vid_conheight.integer - loadingscreenpic->height)/2;
+       loadingscreenpic_vertex3f[2] = loadingscreenpic_vertex3f[5] = loadingscreenpic_vertex3f[8] = loadingscreenpic_vertex3f[11] = 0;
+       loadingscreenpic_vertex3f[0] = loadingscreenpic_vertex3f[9] = x;
+       loadingscreenpic_vertex3f[1] = loadingscreenpic_vertex3f[4] = y;
+       loadingscreenpic_vertex3f[3] = loadingscreenpic_vertex3f[6] = x + loadingscreenpic->width;
+       loadingscreenpic_vertex3f[7] = loadingscreenpic_vertex3f[10] = y + loadingscreenpic->height;
+       loadingscreenpic_texcoord2f[0] = 0;loadingscreenpic_texcoord2f[1] = 0;
+       loadingscreenpic_texcoord2f[2] = 1;loadingscreenpic_texcoord2f[3] = 0;
+       loadingscreenpic_texcoord2f[4] = 1;loadingscreenpic_texcoord2f[5] = 1;
+       loadingscreenpic_texcoord2f[6] = 0;loadingscreenpic_texcoord2f[7] = 1;
+}
+
+static void SCR_DrawLoadingScreen (qboolean clear)
+{
+       // we only need to draw the image if it isn't already there
        GL_Color(1,1,1,1);
        GL_BlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
        GL_DepthRange(0, 1);
        GL_PolygonOffset(0, 0);
        GL_DepthTest(false);
-       R_Mesh_VertexPointer(vertex3f, 0, 0);
-       R_Mesh_ColorPointer(NULL, 0, 0);
-       R_Mesh_ResetTextureState();
-       R_Mesh_TexBind(0, R_GetTexture(pic->tex));
-       R_Mesh_TexCoordPointer(0, 2, texcoord2f, 0, 0);
        R_SetupGenericShader(true);
-       vertex3f[2] = vertex3f[5] = vertex3f[8] = vertex3f[11] = 0;
-       vertex3f[0] = vertex3f[9] = x;
-       vertex3f[1] = vertex3f[4] = y;
-       vertex3f[3] = vertex3f[6] = x + pic->width;
-       vertex3f[7] = vertex3f[10] = y + pic->height;
-       texcoord2f[0] = 0;texcoord2f[1] = 0;
-       texcoord2f[2] = 1;texcoord2f[3] = 0;
-       texcoord2f[4] = 1;texcoord2f[5] = 1;
-       texcoord2f[6] = 0;texcoord2f[7] = 1;
-       if (vid.stereobuffer)
-       {
-               qglDrawBuffer(GL_FRONT_LEFT);
-               R_Mesh_Draw(0, 4, 0, 2, NULL, polygonelements, 0, 0);
-               qglDrawBuffer(GL_FRONT_RIGHT);
-               R_Mesh_Draw(0, 4, 0, 2, NULL, polygonelements, 0, 0);
-       }
-       else
+       R_Mesh_ColorPointer(NULL, 0, 0);
+       if(loadingscreentexture)
        {
-               qglDrawBuffer(GL_FRONT);
+               R_Mesh_VertexPointer(loadingscreentexture_vertex3f, 0, 0);
+               R_Mesh_ResetTextureState();
+               R_Mesh_TexBind(0, R_GetTexture(loadingscreentexture));
+               R_Mesh_TexCoordPointer(0, 2, loadingscreentexture_texcoord2f, 0, 0);
                R_Mesh_Draw(0, 4, 0, 2, NULL, polygonelements, 0, 0);
        }
+       R_Mesh_VertexPointer(loadingscreenpic_vertex3f, 0, 0);
+       R_Mesh_ResetTextureState();
+       R_Mesh_TexBind(0, R_GetTexture(loadingscreenpic->tex));
+       R_Mesh_TexCoordPointer(0, 2, loadingscreenpic_texcoord2f, 0, 0);
+       R_Mesh_Draw(0, 4, 0, 2, NULL, polygonelements, 0, 0);
+       SCR_DrawLoadingStack();
+}
+
+static void SCR_DrawLoadingScreen_SharedFinish (qboolean clear)
+{
        R_Mesh_Finish();
        // refresh
-       // not necessary when rendering to GL_FRONT buffers
-       //VID_Finish();
+       VID_Finish();
        // however this IS necessary on Windows Vista
        qglFinish();
 }
 
+void SCR_UpdateLoadingScreen (qboolean clear)
+{
+       keydest_t       old_key_dest;
+       int                     old_key_consoleactive;
+
+       // don't do anything if not initialized yet
+       if (vid_hidden || !scr_refresh.integer || cls.state == ca_dedicated)
+               return;
+       
+       if(loadingscreentime == realtime)
+               clear |= loadingscreencleared;
+
+       if(clear)
+               SCR_ClearLoadingScreenTexture();
+       else if(loadingscreentime != realtime)
+               SCR_SetLoadingScreenTexture();
+
+       if(loadingscreentime != realtime)
+       {
+               loadingscreentime = realtime;
+               loadingscreenheight = 0;
+       }
+       loadingscreencleared = clear;
+
+       SCR_DrawLoadingScreen_SharedSetup(clear);
+       if (vid.stereobuffer)
+       {
+               qglDrawBuffer(GL_BACK_LEFT);
+               SCR_DrawLoadingScreen(clear);
+               qglDrawBuffer(GL_BACK_RIGHT);
+               SCR_DrawLoadingScreen(clear);
+       }
+       else
+       {
+               qglDrawBuffer(GL_BACK);
+               SCR_DrawLoadingScreen(clear);
+       }
+       SCR_DrawLoadingScreen_SharedFinish(clear);
+
+       // this goes into the event loop, and should prevent unresponsive cursor on vista
+       old_key_dest = key_dest;
+       old_key_consoleactive = key_consoleactive;
+       key_dest = key_void;
+       key_consoleactive = false;
+       Sys_SendKeyEvents();
+       key_dest = old_key_dest;
+       key_consoleactive = old_key_consoleactive;
+}
+
 extern cvar_t cl_minfps;
 extern cvar_t cl_minfps_fade;
 extern cvar_t cl_minfps_qualitymax;