add stubs for S_SoundLength, S_GetEntChallelPosition, dedicated server should compile now

[xonotic/darkplaces.git] / cap_ogg.c

diff --git a/cap_ogg.c b/cap_ogg.c
index 081c4f0a6cc511af105fe0449c69235d02f4528a..424eac411774344d2f27fbd731c10c8783aa6dd4 100644 (file)
--- a/cap_ogg.c
+++ b/cap_ogg.c
@@ -16,7 +16,7 @@ static cvar_t cl_capturevideo_ogg_theora_keyframe_mininterval = {CVAR_SAVE, "cl_
 static cvar_t cl_capturevideo_ogg_theora_keyframe_auto_threshold = {CVAR_SAVE, "cl_capturevideo_ogg_theora_keyframe_auto_threshold", "80", "threshold for key frame decision (0 to 100)"};
 static cvar_t cl_capturevideo_ogg_theora_noise_sensitivity = {CVAR_SAVE, "cl_capturevideo_ogg_theora_noise_sensitivity", "1", "video noise sensitivity (0 to 6); lower is better"};
 static cvar_t cl_capturevideo_ogg_theora_sharpness = {CVAR_SAVE, "cl_capturevideo_ogg_theora_sharpness", "0", "sharpness (0 to 2); lower is sharper"};
-static cvar_t cl_capturevideo_ogg_vorbis_quality = {CVAR_SAVE, "cl_capturevideo_ogg_vorbis_quality", "1", "audio quality (-1 to 10); higher is better"};
+static cvar_t cl_capturevideo_ogg_vorbis_quality = {CVAR_SAVE, "cl_capturevideo_ogg_vorbis_quality", "3", "audio quality (-1 to 10); higher is better"};
 
 // ogg.h stuff
 #ifdef _MSC_VER
@@ -517,13 +517,11 @@ static dllfunction_t theorafuncs[] =
 
 static dllhandle_t og_dll = NULL, vo_dll = NULL, ve_dll = NULL, th_dll = NULL;
 
-qboolean SCR_CaptureVideo_Ogg_OpenLibrary()
+qboolean SCR_CaptureVideo_Ogg_OpenLibrary(void)
 {
        const char* dllnames_og [] =
        {
-#if defined(WIN64)
-               "libogg64.dll",
-#elif defined(WIN32)
+#if defined(WIN32)
                "libogg.dll",
                "ogg.dll",
 #elif defined(MACOSX)
@@ -536,9 +534,7 @@ qboolean SCR_CaptureVideo_Ogg_OpenLibrary()
        };
        const char* dllnames_vo [] =
        {
-#if defined(WIN64)
-               "libvorbis64.dll",
-#elif defined(WIN32)
+#if defined(WIN32)
                "libvorbis.dll",
                "vorbis.dll",
 #elif defined(MACOSX)
@@ -551,9 +547,7 @@ qboolean SCR_CaptureVideo_Ogg_OpenLibrary()
        };
        const char* dllnames_ve [] =
        {
-#if defined(WIN64)
-               "libvorbisenc64.dll",
-#elif defined(WIN32)
+#if defined(WIN32)
                "libvorbisenc.dll",
                "vorbisenc.dll",
 #elif defined(MACOSX)
@@ -566,9 +560,7 @@ qboolean SCR_CaptureVideo_Ogg_OpenLibrary()
        };
        const char* dllnames_th [] =
        {
-#if defined(WIN64)
-               "libtheora64.dll",
-#elif defined(WIN32)
+#if defined(WIN32)
                "libtheora.dll",
                "theora.dll",
 #elif defined(MACOSX)
@@ -590,7 +582,7 @@ qboolean SCR_CaptureVideo_Ogg_OpenLibrary()
                Sys_LoadLibrary (dllnames_ve, &ve_dll, vorbisencfuncs);
 }
 
-void SCR_CaptureVideo_Ogg_Init()
+void SCR_CaptureVideo_Ogg_Init(void)
 {
        SCR_CaptureVideo_Ogg_OpenLibrary();
 
@@ -604,12 +596,12 @@ void SCR_CaptureVideo_Ogg_Init()
        Cvar_RegisterVariable(&cl_capturevideo_ogg_vorbis_quality);
 }
 
-qboolean SCR_CaptureVideo_Ogg_Available()
+qboolean SCR_CaptureVideo_Ogg_Available(void)
 {
        return og_dll && th_dll && vo_dll && ve_dll;
 }
 
-void SCR_CaptureVideo_Ogg_CloseDLL()
+void SCR_CaptureVideo_Ogg_CloseDLL(void)
 {
        Sys_UnloadLibrary (&ve_dll);
        Sys_UnloadLibrary (&vo_dll);
@@ -650,7 +642,7 @@ typedef struct capturevideostate_ogg_formatspecific_s
 capturevideostate_ogg_formatspecific_t;
 #define LOAD_FORMATSPECIFIC_OGG() capturevideostate_ogg_formatspecific_t *format = (capturevideostate_ogg_formatspecific_t *) cls.capturevideo.formatspecific
 
-static void SCR_CaptureVideo_Ogg_Interleave()
+static void SCR_CaptureVideo_Ogg_Interleave(void)
 {
        LOAD_FORMATSPECIFIC_OGG();
        ogg_page pg;
@@ -708,7 +700,7 @@ static void SCR_CaptureVideo_Ogg_Interleave()
        }
 }
 
-static void SCR_CaptureVideo_Ogg_FlushInterleaving()
+static void SCR_CaptureVideo_Ogg_FlushInterleaving(void)
 {
        LOAD_FORMATSPECIFIC_OGG();
 
@@ -726,7 +718,7 @@ static void SCR_CaptureVideo_Ogg_FlushInterleaving()
        }
 }
 
-static void SCR_CaptureVideo_Ogg_EndVideo()
+static void SCR_CaptureVideo_Ogg_EndVideo(void)
 {
        LOAD_FORMATSPECIFIC_OGG();
        ogg_page pg;
@@ -819,7 +811,7 @@ static void SCR_CaptureVideo_Ogg_EndVideo()
        cls.capturevideo.videofile = NULL;
 }
 
-static void SCR_CaptureVideo_Ogg_ConvertFrame_BGRA_to_YUV()
+static void SCR_CaptureVideo_Ogg_ConvertFrame_BGRA_to_YUV(void)
 {
        LOAD_FORMATSPECIFIC_OGG();
        yuv_buffer *yuv;
@@ -932,7 +924,7 @@ static void SCR_CaptureVideo_Ogg_SoundFrame(const portable_sampleframe_t *paintb
        SCR_CaptureVideo_Ogg_Interleave();
 }
 
-void SCR_CaptureVideo_Ogg_BeginVideo()
+void SCR_CaptureVideo_Ogg_BeginVideo(void)
 {
        cls.capturevideo.format = CAPTUREVIDEOFORMAT_OGG_VORBIS_THEORA;
        cls.capturevideo.formatextension = "ogv";
@@ -981,13 +973,13 @@ void SCR_CaptureVideo_Ogg_BeginVideo()
                        format->yuv[i].uv_width = ti.width / 2;
                        format->yuv[i].uv_height = ti.height / 2;
                        format->yuv[i].uv_stride = ti.width / 2;
-                       format->yuv[i].y = Mem_Alloc(tempmempool, format->yuv[i].y_stride * format->yuv[i].y_height);
-                       format->yuv[i].u = Mem_Alloc(tempmempool, format->yuv[i].uv_stride * format->yuv[i].uv_height);
-                       format->yuv[i].v = Mem_Alloc(tempmempool, format->yuv[i].uv_stride * format->yuv[i].uv_height);
+                       format->yuv[i].y = (unsigned char *) Mem_Alloc(tempmempool, format->yuv[i].y_stride * format->yuv[i].y_height);
+                       format->yuv[i].u = (unsigned char *) Mem_Alloc(tempmempool, format->yuv[i].uv_stride * format->yuv[i].uv_height);
+                       format->yuv[i].v = (unsigned char *) Mem_Alloc(tempmempool, format->yuv[i].uv_stride * format->yuv[i].uv_height);
                }
                format->yuvi = -1; // -1: no frame valid yet, write into 0
 
-               FindFraction(cls.capturevideo.framerate, &num, &denom, 1001);
+               FindFraction(cls.capturevideo.framerate / cls.capturevideo.framestep, &num, &denom, 1001);
                ti.fps_numerator = num;
                ti.fps_denominator = denom;
 
@@ -1009,13 +1001,13 @@ void SCR_CaptureVideo_Ogg_BeginVideo()
                        if(ti.quality < 0)
                        {
                                ti.target_bitrate = -1;
-                               ti.keyframe_data_target_bitrate = -1;
+                               ti.keyframe_data_target_bitrate = (unsigned int)-1;
                                ti.quality = 63;
                        }
                        else
                        {
                                ti.target_bitrate = -1;
-                               ti.keyframe_data_target_bitrate = -1;
+                               ti.keyframe_data_target_bitrate = (unsigned int)-1;
                                ti.quality = bound(0, ti.quality, 63);
                        }
                }
@@ -1024,13 +1016,13 @@ void SCR_CaptureVideo_Ogg_BeginVideo()
                        if(ti.quality < 0)
                        {
                                ti.target_bitrate = bound(45000, ti.target_bitrate, 2000000);
-                               ti.keyframe_data_target_bitrate = ti.target_bitrate * max(1, cl_capturevideo_ogg_theora_keyframe_bitrate_multiplier.value);
+                               ti.keyframe_data_target_bitrate = (int) (ti.target_bitrate * max(1, cl_capturevideo_ogg_theora_keyframe_bitrate_multiplier.value));
                                ti.quality = -1;
                        }
                        else
                        {
                                ti.target_bitrate = bound(45000, ti.target_bitrate, 2000000);
-                               ti.keyframe_data_target_bitrate = ti.target_bitrate * max(1, cl_capturevideo_ogg_theora_keyframe_bitrate_multiplier.value);
+                               ti.keyframe_data_target_bitrate = (int) (ti.target_bitrate * max(1, cl_capturevideo_ogg_theora_keyframe_bitrate_multiplier.value));
                                ti.quality = -1;
                        }
                }