Experimental theora capturevideo code.
authordivverent <divverent@d7cf8633-e32d-0410-b094-e92efae38249>
Wed, 18 Feb 2009 10:14:55 +0000 (10:14 +0000)
committerdivverent <divverent@d7cf8633-e32d-0410-b094-e92efae38249>
Wed, 18 Feb 2009 10:14:55 +0000 (10:14 +0000)
Still contains known memory leaks, and no configurability at all.
Try out using scr_capturevideo_ogg 1 and then capturing a video.

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@8722 d7cf8633-e32d-0410-b094-e92efae38249

cl_screen.c
client.h
common.c
common.h
makefile.inc
snd_3dras.c
snd_main.c
snd_main.h
snd_mix.c
snd_null.c
sound.h

index 2471503..05032cc 100644 (file)
@@ -6,6 +6,7 @@
 #include "cl_collision.h"
 #include "libcurl.h"
 #include "csprogs.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"
@@ -35,6 +36,7 @@ cvar_t cl_capturevideo_height = {0, "cl_capturevideo_height", "0", "scales all f
 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_number = {CVAR_SAVE, "cl_capturevideo_number", "1", "number to append to video filename, incremented each time a capture begins"};
+cvar_t cl_capturevideo_ogg = {0, "cl_capturevideo_ogg", "0", "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)"};
@@ -855,6 +857,7 @@ void CL_Screen_Init(void)
        Cvar_RegisterVariable (&cl_capturevideo_realtime);
        Cvar_RegisterVariable (&cl_capturevideo_fps);
        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 +880,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;
 }
 
@@ -1209,28 +1214,6 @@ static void SCR_CaptureVideo_RIFF_OverflowCheck(int framesize)
        }
 }
 
-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;
@@ -1264,8 +1247,9 @@ void SCR_CaptureVideo_BeginVideo(void)
        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.soundchannels = S_GetSoundChannels();
        cls.capturevideo.frame = 0;
        cls.capturevideo.soundsampleframe = 0;
        cls.capturevideo.realtime = cl_capturevideo_realtime.integer != 0;
@@ -1313,17 +1297,19 @@ Cr = R *  .500 + G * -.419 + B * -.0813 + 128.;
                cls.capturevideo.yuvnormalizetable[2][i] = 16 + i * (240-16) / 256;
        }
 
-       //if (cl_capturevideo_)
-       //{
-       //}
-       //else
+       if (cl_capturevideo_ogg.integer && SCR_CaptureVideo_Ogg_Available())
+       {
+               cls.capturevideo.format = CAPTUREVIDEOFORMAT_OGG_VORBIS_THEORA;
+               SCR_CaptureVideo_Ogg_Begin();
+       }
+       else
        {
                cls.capturevideo.format = CAPTUREVIDEOFORMAT_AVI_I420;
                cls.capturevideo.videofile = FS_OpenRealFile(va("%s.avi", cls.capturevideo.basename), "wb", false);
                cls.capturevideo.canseek = (FS_Seek(cls.capturevideo.videofile, 0, SEEK_SET) == 0);
                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 ", -1);
+               SCR_CaptureVideo_RIFF_Push("RIFF", "AVI ", cls.capturevideo.canseek ? -1 : 12+(8+56+12+(12+52+8+40+8+68)+(cls.capturevideo.soundrate?(12+12+52+8+18):0)+12+(8+4))+12+(8+(((int) strlen(engineversion) | 1) + 1))+12);
                // AVI main header
                SCR_CaptureVideo_RIFF_Push("LIST", "hdrl", cls.capturevideo.canseek ? -1 : 8+56+12+(12+52+8+40+8+68)+(cls.capturevideo.soundrate?(12+12+52+8+18):0)+12+(8+4));
                SCR_CaptureVideo_RIFF_Push("avih", NULL, 56);
@@ -1332,7 +1318,7 @@ Cr = R *  .500 + G * -.419 + B * -.0813 + 128.;
                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(0xFFFFFFFF); // total frames
+               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
@@ -1507,18 +1493,28 @@ Cr = R *  .500 + G * -.419 + B * -.0813 + 128.;
 #endif
                SCR_CaptureVideo_RIFF_Pop();
                // begin the actual video section now
-               SCR_CaptureVideo_RIFF_Push("LIST", "movi", -1);
+               SCR_CaptureVideo_RIFF_Push("LIST", "movi", cls.capturevideo.canseek ? -1 : 0);
                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);
+
+               if(!cls.capturevideo.canseek)
+               {
+                       // close the movi immediately
+                       SCR_CaptureVideo_RIFF_Pop();
+                       // close the AVI immediately (we'll put all frames into AVIX)
+                       SCR_CaptureVideo_RIFF_Pop();
+               }
        }
 
        switch(cls.capturevideo.format)
        {
        case CAPTUREVIDEOFORMAT_AVI_I420:
                break;
+       case CAPTUREVIDEOFORMAT_OGG_VORBIS_THEORA:
+               break;
        default:
                break;
        }
@@ -1534,32 +1530,40 @@ void SCR_CaptureVideo_EndVideo(void)
                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);
-                       if(cls.capturevideo.videofile_totalframes_offset1)
-                       if(FS_Seek(cls.capturevideo.videofile, cls.capturevideo.videofile_totalframes_offset1, SEEK_SET) >= 0)
-                       {
-                               SCR_CaptureVideo_RIFF_Write32(cls.capturevideo.frame);
-                               SCR_CaptureVideo_RIFF_Flush();
-                       }
-                       if(cls.capturevideo.videofile_totalframes_offset2)
-                       if(FS_Seek(cls.capturevideo.videofile, cls.capturevideo.videofile_totalframes_offset2, SEEK_SET) >= 0)
-                       {
-                               SCR_CaptureVideo_RIFF_Write32(cls.capturevideo.frame);
-                               SCR_CaptureVideo_RIFF_Flush();
-                       }
-                       if (cls.capturevideo.soundrate)
+
+                       if(cls.capturevideo.canseek)
                        {
-                               if(cls.capturevideo.videofile_totalsampleframes_offset)
-                               if(FS_Seek(cls.capturevideo.videofile, cls.capturevideo.videofile_totalsampleframes_offset, SEEK_SET) >= 0)
+                               // close any open chunks
+                               SCR_CaptureVideo_RIFF_Finish(true);
+
+                               // go back and fix the video frames and audio samples fields
+                               if(cls.capturevideo.videofile_totalframes_offset1)
+                               if(FS_Seek(cls.capturevideo.videofile, cls.capturevideo.videofile_totalframes_offset1, SEEK_SET) >= 0)
+                               {
+                                       SCR_CaptureVideo_RIFF_Write32(cls.capturevideo.frame);
+                                       SCR_CaptureVideo_RIFF_Flush();
+                               }
+                               if(cls.capturevideo.videofile_totalframes_offset2)
+                               if(FS_Seek(cls.capturevideo.videofile, cls.capturevideo.videofile_totalframes_offset2, SEEK_SET) >= 0)
                                {
-                                       SCR_CaptureVideo_RIFF_Write32(cls.capturevideo.soundsampleframe);
+                                       SCR_CaptureVideo_RIFF_Write32(cls.capturevideo.frame);
                                        SCR_CaptureVideo_RIFF_Flush();
                                }
+                               if (cls.capturevideo.soundrate)
+                               {
+                                       if(cls.capturevideo.videofile_totalsampleframes_offset)
+                                       if(FS_Seek(cls.capturevideo.videofile, cls.capturevideo.videofile_totalsampleframes_offset, SEEK_SET) >= 0)
+                                       {
+                                               SCR_CaptureVideo_RIFF_Write32(cls.capturevideo.soundsampleframe);
+                                               SCR_CaptureVideo_RIFF_Flush();
+                                       }
+                               }
                        }
                        break;
+               case CAPTUREVIDEOFORMAT_OGG_VORBIS_THEORA:
+                       SCR_CaptureVideo_Ogg_EndVideo();
+                       break;
                default:
                        break;
                }
@@ -1679,6 +1683,10 @@ qboolean SCR_CaptureVideo_VideoFrame(int newframenum)
        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
+
+       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);
+
        switch (cls.capturevideo.format)
        {
        case CAPTUREVIDEOFORMAT_AVI_I420:
@@ -1686,42 +1694,94 @@ qboolean SCR_CaptureVideo_VideoFrame(int newframenum)
                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++)
                {
                        if(cls.capturevideo.canseek)
+                       {
+                               SCR_CaptureVideo_RIFF_OverflowCheck(8 + x);
                                SCR_CaptureVideo_RIFF_IndexEntry("00dc", x, 0x10); // AVIIF_KEYFRAME
+                       }
+
+                       if(!cls.capturevideo.canseek)
+                       {
+                               SCR_CaptureVideo_RIFF_Push("RIFF", "AVIX", 12+8+x);
+                               SCR_CaptureVideo_RIFF_Push("LIST", "movi", 8+x);
+                       }
                        SCR_CaptureVideo_RIFF_Push("00dc", NULL, x);
                        SCR_CaptureVideo_RIFF_WriteBytes(out, x);
                        SCR_CaptureVideo_RIFF_Pop();
+                       if(!cls.capturevideo.canseek)
+                       {
+                               SCR_CaptureVideo_RIFF_Pop();
+                               SCR_CaptureVideo_RIFF_Pop();
+                       }
                }
                return true;
+       case CAPTUREVIDEOFORMAT_OGG_VORBIS_THEORA:
+               for (;cls.capturevideo.frame < newframenum;cls.capturevideo.frame++)
+                       SCR_CaptureVideo_Ogg_VideoFrame();
+               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;
+       unsigned char bufstereo16le[PAINTBUFFER_SIZE * 4];
+       unsigned char* out_ptr;
+       size_t i;
+
        cls.capturevideo.soundsampleframe += length;
+
        switch (cls.capturevideo.format)
        {
        case CAPTUREVIDEOFORMAT_AVI_I420:
+
+               // write the sound buffer as little endian 16bit interleaved stereo
+               for(i = 0, out_ptr = bufstereo16le; i < length; i++, out_ptr += 4)
+               {
+                       int n0, n1;
+
+                       n0 = paintbuffer[i].sample[0];
+                       n0 = bound(-32768, n0, 32767);
+                       out_ptr[0] = (unsigned char)n0;
+                       out_ptr[1] = (unsigned char)(n0 >> 8);
+
+                       n1 = paintbuffer[i].sample[1];
+                       n1 = bound(-32768, n1, 32767);
+                       out_ptr[2] = (unsigned char)n1;
+                       out_ptr[3] = (unsigned char)(n1 >> 8);
+               }
+
                x = length*4;
-               SCR_CaptureVideo_RIFF_OverflowCheck(8 + x);
                if(cls.capturevideo.canseek)
+               {
+                       SCR_CaptureVideo_RIFF_OverflowCheck(8 + x);
                        SCR_CaptureVideo_RIFF_IndexEntry("01wb", x, 0x10); // AVIIF_KEYFRAME
+               }
+
+               if(!cls.capturevideo.canseek)
+               {
+                       SCR_CaptureVideo_RIFF_Push("RIFF", "AVIX", 12+8+x);
+                       SCR_CaptureVideo_RIFF_Push("LIST", "movi", 8+x);
+               }
                SCR_CaptureVideo_RIFF_Push("01wb", NULL, x);
                SCR_CaptureVideo_RIFF_WriteBytes(bufstereo16le, x);
                SCR_CaptureVideo_RIFF_Pop();
+               if(!cls.capturevideo.canseek)
+               {
+                       SCR_CaptureVideo_RIFF_Pop();
+                       SCR_CaptureVideo_RIFF_Pop();
+               }
+               break;
+       case CAPTUREVIDEOFORMAT_OGG_VORBIS_THEORA:
+               SCR_CaptureVideo_Ogg_SoundFrame(paintbuffer, length);
                break;
        default:
                break;
index 9c2030f..d7b8c36 100644 (file)
--- a/client.h
+++ b/client.h
@@ -448,7 +448,8 @@ qw_downloadtype_t;
 
 typedef enum capturevideoformat_e
 {
-       CAPTUREVIDEOFORMAT_AVI_I420
+       CAPTUREVIDEOFORMAT_AVI_I420,
+       CAPTUREVIDEOFORMAT_OGG_VORBIS_THEORA,
 }
 capturevideoformat_t;
 
@@ -476,6 +477,7 @@ typedef struct capturevideostate_s
        qboolean canseek;
        capturevideoformat_t format;
        int soundrate;
+       int soundchannels;
        int frame;
        int soundsampleframe; // for AVI saving
        unsigned char *screenbuffer;
@@ -492,6 +494,7 @@ typedef struct capturevideostate_s
        unsigned char yuvnormalizetable[3][256];
        char basename[64];
        int width, height;
+       void *formatspecific;
 }
 capturevideostate_t;
 
index 18affb8..c370552 100644 (file)
--- a/common.c
+++ b/common.c
@@ -2190,3 +2190,25 @@ strlcpy(char *dst, const char *src, size_t siz)
 }
 
 #endif  // #ifndef HAVE_STRLCPY
+
+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;
+               }
+       }
+}
index bea8932..c48ed39 100644 (file)
--- a/common.h
+++ b/common.h
@@ -355,5 +355,7 @@ size_t strlcpy(char *dst, const char *src, size_t siz);
 
 #endif  // #ifndef HAVE_STRLCPY
 
+void FindFraction(double val, int *num, int *denom, int denomMax);
+
 #endif
 
index 4598721..3195204 100644 (file)
@@ -77,6 +77,7 @@ OBJ_NOCD=cd_null.o
 
 # Common objects
 OBJ_COMMON= \
+       cap_ogg.o \
        cd_shared.o \
        cl_collision.o \
        cl_demo.o \
index 5ef28bc..3766120 100644 (file)
@@ -1022,3 +1022,9 @@ int S_GetSoundRate (void){
        Con_Printf("So let's assume 44100.\n");
        return 44100;
 }
+
+int S_GetSoundChannels (void){
+       Con_Printf("Inside 3DRAS, the soundrate of the end-user is NONE of the dev's concern.\n");
+       Con_Printf("So let's assume 2.\n");
+       return 2;
+}
index cd30df0..495381e 100644 (file)
@@ -354,6 +354,11 @@ int S_GetSoundRate(void)
        return snd_renderbuffer ? snd_renderbuffer->format.speed : 0;
 }
 
+int S_GetSoundChannels(void)
+{
+       return snd_renderbuffer ? snd_renderbuffer->format.channels : 0;
+}
+
 
 static qboolean S_ChooseCheaperFormat (snd_format_t* format, qboolean fixed_speed, qboolean fixed_width, qboolean fixed_channels)
 {
index 0eea2fd..61c43b5 100644 (file)
@@ -185,5 +185,12 @@ qboolean SndSys_LockRenderBuffer (void);
 // Release the exclusive lock on "snd_renderbuffer"
 void SndSys_UnlockRenderBuffer (void);
 
+// exported for capturevideo so ogg can see all channels
+typedef struct portable_samplepair_s
+{
+       int sample[SND_LISTENERS];
+} portable_sampleframe_t;
+// LordHavoc: was 512, expanded to 2048
+#define        PAINTBUFFER_SIZE 2048
 
 #endif
index e0c127b..1e013f4 100644 (file)
--- a/snd_mix.c
+++ b/snd_mix.c
@@ -22,42 +22,16 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include "snd_main.h"
 
 
-typedef struct portable_samplepair_s
-{
-       int sample[SND_LISTENERS];
-} portable_sampleframe_t;
-
-// LordHavoc: was 512, expanded to 2048
-#define        PAINTBUFFER_SIZE 2048
 static portable_sampleframe_t paintbuffer[PAINTBUFFER_SIZE];
 
 
-extern void SCR_CaptureVideo_SoundFrame(unsigned char *bufstereo16le, size_t length, int rate);
+extern void SCR_CaptureVideo_SoundFrame(const portable_sampleframe_t *paintbuffer, size_t length);
 static void S_CaptureAVISound(size_t length)
 {
-       size_t i;
-       unsigned char out[PAINTBUFFER_SIZE * 4];
-       unsigned char* out_ptr;
-
        if (!cls.capturevideo.active)
                return;
 
-       // write the sound buffer as little endian 16bit interleaved stereo
-       for(i = 0, out_ptr = out; i < length; i++, out_ptr += 4)
-       {
-               int n0, n1;
-
-               n0 = paintbuffer[i].sample[0];
-               n0 = bound(-32768, n0, 32767);
-               out_ptr[0] = (unsigned char)n0;
-               out_ptr[1] = (unsigned char)(n0 >> 8);
-
-               n1 = paintbuffer[i].sample[1];
-               n1 = bound(-32768, n1, 32767);
-               out_ptr[2] = (unsigned char)n1;
-               out_ptr[3] = (unsigned char)(n1 >> 8);
-       }
-       SCR_CaptureVideo_SoundFrame(out, length, snd_renderbuffer->format.speed);
+       SCR_CaptureVideo_SoundFrame(paintbuffer, length);
 }
 
 static void S_ConvertPaintBuffer(const portable_sampleframe_t *painted_ptr, void *rb_ptr, int nbframes, int width, int channels)
index 1ed1cc8..542b0b1 100755 (executable)
@@ -131,3 +131,8 @@ int S_GetSoundRate(void)
 {
        return 0;
 }
+
+int S_GetSoundChannels(void)
+{
+       return 0;
+}
diff --git a/sound.h b/sound.h
index 2496170..19f7e12 100644 (file)
--- a/sound.h
+++ b/sound.h
@@ -87,5 +87,6 @@ void S_BlockSound (void);
 void S_UnblockSound (void);
 
 int S_GetSoundRate (void);
+int S_GetSoundChannels (void);
 
 #endif