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)
};
const char* dllnames_vo [] =
{
-#if defined(WIN64)
- "libvorbis64.dll",
-#elif defined(WIN32)
+#if defined(WIN32)
"libvorbis.dll",
"vorbis.dll",
#elif defined(MACOSX)
};
const char* dllnames_ve [] =
{
-#if defined(WIN64)
- "libvorbisenc64.dll",
-#elif defined(WIN32)
+#if defined(WIN32)
"libvorbisenc.dll",
"vorbisenc.dll",
#elif defined(MACOSX)
};
const char* dllnames_th [] =
{
-#if defined(WIN64)
- "libtheora64.dll",
-#elif defined(WIN32)
+#if defined(WIN32)
"libtheora.dll",
"theora.dll",
#elif defined(MACOSX)
Sys_LoadLibrary (dllnames_ve, &ve_dll, vorbisencfuncs);
}
-void SCR_CaptureVideo_Ogg_Init()
+void SCR_CaptureVideo_Ogg_Init(void)
{
SCR_CaptureVideo_Ogg_OpenLibrary();
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);
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;
}
}
-static void SCR_CaptureVideo_Ogg_FlushInterleaving()
+static void SCR_CaptureVideo_Ogg_FlushInterleaving(void)
{
LOAD_FORMATSPECIFIC_OGG();
}
}
-static void SCR_CaptureVideo_Ogg_EndVideo()
+static void SCR_CaptureVideo_Ogg_EndVideo(void)
{
LOAD_FORMATSPECIFIC_OGG();
ogg_page pg;
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;
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";
}
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;
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);
}
}
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;
}
}