X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=cl_video.c;h=2804661b2b8c38c437ac6a51a779a27ee89b32e0;hp=7c4b2a5ebda32f919e79f0174902a421445c7a85;hb=73f27d62983b6af1cb9a6971d0a4cb6275b91a07;hpb=a15e0c4cddf4f60827a3be097197447c52b7989a diff --git a/cl_video.c b/cl_video.c index 7c4b2a5e..2804661b 100644 --- a/cl_video.c +++ b/cl_video.c @@ -1,26 +1,31 @@ #include "quakedef.h" -#include "cl_dyntexture.h" #include "cl_video.h" + +// cvars +cvar_t cl_video_subtitles = {CF_CLIENT | CF_ARCHIVE, "cl_video_subtitles", "0", "show subtitles for videos (if they are present)"}; +cvar_t cl_video_subtitles_lines = {CF_CLIENT | CF_ARCHIVE, "cl_video_subtitles_lines", "4", "how many lines to occupy for subtitles"}; +cvar_t cl_video_subtitles_textsize = {CF_CLIENT | CF_ARCHIVE, "cl_video_subtitles_textsize", "16", "textsize for subtitles"}; +cvar_t cl_video_scale = {CF_CLIENT | CF_ARCHIVE, "cl_video_scale", "1", "scale of video, 1 = fullscreen, 0.75 - 3/4 of screen etc."}; +cvar_t cl_video_scale_vpos = {CF_CLIENT | CF_ARCHIVE, "cl_video_scale_vpos", "0", "vertical align of scaled video, -1 is top, 1 is bottom"}; +cvar_t cl_video_stipple = {CF_CLIENT | CF_ARCHIVE, "cl_video_stipple", "0", "draw interlacing-like effect on videos, similar to scr_stipple but static and used only with video playing."}; +cvar_t cl_video_brightness = {CF_CLIENT | CF_ARCHIVE, "cl_video_brightness", "1", "brightness of video, 1 = fullbright, 0.75 - 3/4 etc."}; +cvar_t cl_video_keepaspectratio = {CF_CLIENT | CF_ARCHIVE, "cl_video_keepaspectratio", "0", "keeps aspect ratio of fullscreen videos, leaving black color on unfilled areas, a value of 2 let video to be stretched horizontally with top & bottom being sliced out"}; +cvar_t cl_video_fadein = {CF_CLIENT | CF_ARCHIVE, "cl_video_fadein", "0", "fading-from-black effect once video is started, in seconds"}; +cvar_t cl_video_fadeout = {CF_CLIENT | CF_ARCHIVE, "cl_video_fadeout", "0", "fading-to-black effect once video is ended, in seconds"}; + +cvar_t v_glslgamma_video = {CF_CLIENT | CF_ARCHIVE, "v_glslgamma_video", "1", "applies GLSL gamma to played video, could be a fraction, requires r_glslgamma_2d 1."}; + +// DPV stream decoder #include "dpvsimpledecode.h" -// VorteX: JAM video module used by Blood Omnicide -#define USEJAM -#ifdef USEJAM - #include "cl_video_jamdecode.c" -#endif +// VorteX: libavcodec implementation +#include "cl_video_libavw.h" -// cvars -cvar_t cl_video_subtitles = {CVAR_SAVE, "cl_video_subtitles", "0", "show subtitles for videos (if they are present)"}; -cvar_t cl_video_subtitles_lines = {CVAR_SAVE, "cl_video_subtitles_lines", "4", "how many lines to occupy for subtitles"}; -cvar_t cl_video_subtitles_textsize = {CVAR_SAVE, "cl_video_subtitles_textsize", "16", "textsize for subtitles"}; -cvar_t cl_video_scale = {CVAR_SAVE, "cl_video_scale", "1", "scale of video, 1 = fullscreen, 0.75 - 3/4 of screen etc."}; -cvar_t cl_video_scale_vpos = {CVAR_SAVE, "cl_video_scale_vpos", "0", "vertical align of scaled video, -1 is top, 1 is bottom"}; -cvar_t cl_video_stipple = {CVAR_SAVE, "cl_video_stipple", "0", "draw interlacing-like effect on videos, similar to scr_stipple but static and used only with video playing."}; -cvar_t cl_video_brightness = {CVAR_SAVE, "cl_video_brightness", "1", "brightness of video, 1 = fullbright, 0.75 - 3/4 etc."}; -cvar_t cl_video_keepaspectratio = {CVAR_SAVE, "cl_video_keepaspectratio", "0", "keeps aspect ratio of fullscreen videos, leaving black color on unfilled areas, a value of 2 let video to be stretched horizontally with top & bottom being sliced out"}; -cvar_t cl_video_fadein = {CVAR_SAVE, "cl_video_fadein", "0", "fading-from-black effect once video is started, in seconds"}; -cvar_t cl_video_fadeout = {CVAR_SAVE, "cl_video_fadeout", "0", "fading-to-black effect once video is ended, in seconds"}; +// JAM video decoder used by Blood Omnicide +#ifdef JAMVIDEO +#include "cl_video_jamdecode.c" +#endif // constants (and semi-constants) static int cl_videormask; @@ -41,42 +46,45 @@ static clvideo_t *FindUnusedVid( void ) return NULL; } -static qboolean OpenStream( clvideo_t * video ) +static qbool OpenStream( clvideo_t * video ) { const char *errorstring; + video->stream = dpvsimpledecode_open( video, video->filename, &errorstring); - if (!video->stream ) - { -#ifdef USEJAM - video->stream = jam_open( video, video->filename, &errorstring); - if (video->stream) - return true; + if (video->stream) + return true; + +#ifdef JAMVIDEO + video->stream = jam_open( video, video->filename, &errorstring); + if (video->stream) + return true; #endif - Con_Printf("unable to open \"%s\", error: %s\n", video->filename, errorstring); - return false; - } - return true; + + video->stream = LibAvW_OpenVideo( video, video->filename, &errorstring); + if (video->stream) + return true; + + Con_Printf(CON_ERROR "unable to open \"%s\", error: %s\n", video->filename, errorstring); + return false; } static void VideoUpdateCallback(rtexture_t *rt, void *data) { clvideo_t *video = (clvideo_t *) data; - R_UpdateTexture( video->cpif.tex, (unsigned char *)video->imagedata, 0, 0, 0, video->cpif.width, video->cpif.height, 1 ); + Draw_NewPic(video->name, video->width, video->height, (unsigned char *)video->imagedata, TEXTYPE_BGRA, TEXF_CLAMP); } static void LinkVideoTexture( clvideo_t *video ) { - video->cpif.tex = R_LoadTexture2D( cl_videotexturepool, video->cpif.name, video->cpif.width, video->cpif.height, NULL, TEXTYPE_BGRA, TEXF_PERSISTENT | TEXF_CLAMP, -1, NULL ); - R_MakeTextureDynamic( video->cpif.tex, VideoUpdateCallback, video ); - CL_LinkDynTexture( video->cpif.name, video->cpif.tex ); + video->cachepic = Draw_NewPic(video->name, video->width, video->height, NULL, TEXTYPE_BGRA, TEXF_CLAMP); + // make R_GetTexture() call our VideoUpdateCallback + R_MakeTextureDynamic(Draw_GetPicTexture(video->cachepic), VideoUpdateCallback, video); } static void UnlinkVideoTexture( clvideo_t *video ) { - CL_UnlinkDynTexture( video->cpif.name ); - // free the texture - R_FreeTexture( video->cpif.tex ); - video->cpif.tex = NULL; + // free the texture (this does not destroy the cachepic_t, which is eternal) + Draw_FreePic(video->name); // free the image data Mem_Free( video->imagedata ); } @@ -89,10 +97,14 @@ static void SuspendVideo( clvideo_t * video ) UnlinkVideoTexture(video); // if we are in firstframe mode, also close the stream if (video->state == CLVIDEO_FIRSTFRAME) - video->close(video->stream); + { + if (video->stream) + video->close(video->stream); + video->stream = NULL; + } } -static qboolean WakeVideo( clvideo_t * video ) +static qbool WakeVideo( clvideo_t * video ) { if( !video->suspended ) return true; @@ -104,11 +116,11 @@ static qboolean WakeVideo( clvideo_t * video ) return false; } - video->imagedata = Mem_Alloc( cls.permanentmempool, video->cpif.width * video->cpif.height * cl_videobytesperpixel ); + video->imagedata = Mem_Alloc( cls.permanentmempool, video->width * video->height * cl_videobytesperpixel ); LinkVideoTexture( video ); // update starttime - video->starttime += realtime - video->lasttime; + video->starttime += host.realtime - video->lasttime; return true; } @@ -125,11 +137,11 @@ static void LoadSubtitles( clvideo_t *video, const char *subtitlesfile ) char overridename[MAX_QPATH]; cvar_t *langcvar; - langcvar = Cvar_FindVar("language"); + langcvar = Cvar_FindVar(&cvars_all, "language", CF_CLIENT | CF_SERVER); subtitle_text = NULL; if (langcvar) { - dpsnprintf(overridename, sizeof(overridename), "script/locale/%s/%s", langcvar->string, subtitlesfile); + dpsnprintf(overridename, sizeof(overridename), "locale/%s/%s", langcvar->string, subtitlesfile); subtitle_text = (char *)FS_LoadFile(overridename, cls.permanentmempool, false, NULL); } if (!subtitle_text) @@ -166,7 +178,7 @@ static void LoadSubtitles( clvideo_t *video, const char *subtitlesfile ) // check limits if (video->subtitles == CLVIDEO_MAX_SUBTITLES) { - Con_Printf("WARNING: CLVIDEO_MAX_SUBTITLES = %i reached when reading subtitles from '%s'\n", CLVIDEO_MAX_SUBTITLES, subtitlesfile); + Con_Printf(CON_WARN "WARNING: CLVIDEO_MAX_SUBTITLES = %i reached when reading subtitles from '%s'\n", CLVIDEO_MAX_SUBTITLES, subtitlesfile); break; } // add a sub @@ -187,7 +199,7 @@ static void LoadSubtitles( clvideo_t *video, const char *subtitlesfile ) if (numsubs > 0) // make true len for prev sub, autofix overlapping subtitles { if (video->subtitle_end[numsubs-1] <= 0) - video->subtitle_end[numsubs-1] = 99999999; // fixme: make it end when video ends? + video->subtitle_end[numsubs-1] = (float)99999999; // fixme: make it end when video ends? else video->subtitle_end[numsubs-1] = video->subtitle_start[numsubs-1] + video->subtitle_end[numsubs-1]; } @@ -202,11 +214,12 @@ static void LoadSubtitles( clvideo_t *video, const char *subtitlesfile ) static clvideo_t* OpenVideo( clvideo_t *video, const char *filename, const char *name, int owner, const char *subtitlesfile ) { - strlcpy( video->filename, filename, sizeof(video->filename) ); + strlcpy(video->filename, filename, sizeof(video->filename)); + dpsnprintf(video->name, sizeof(video->name), CLVIDEOPREFIX "%s", name); video->ownertag = owner; if( strncmp( name, CLVIDEOPREFIX, sizeof( CLVIDEOPREFIX ) - 1 ) ) return NULL; - strlcpy( video->cpif.name, name, sizeof(video->cpif.name) ); + video->cachepic = Draw_CachePic_Flags(name, CACHEPICFLAG_NOTPERSISTENT | CACHEPICFLAG_QUIET); if( !OpenStream( video ) ) return NULL; @@ -214,12 +227,12 @@ static clvideo_t* OpenVideo( clvideo_t *video, const char *filename, const char video->state = CLVIDEO_FIRSTFRAME; video->framenum = -1; video->framerate = video->getframerate( video->stream ); - video->lasttime = realtime; + video->lasttime = host.realtime; video->subtitles = 0; - video->cpif.width = video->getwidth( video->stream ); - video->cpif.height = video->getheight( video->stream ); - video->imagedata = Mem_Alloc( cls.permanentmempool, video->cpif.width * video->cpif.height * cl_videobytesperpixel ); + video->width = video->getwidth( video->stream ); + video->height = video->getheight( video->stream ); + video->imagedata = Mem_Alloc( cls.permanentmempool, video->width * video->height * cl_videobytesperpixel ); LinkVideoTexture( video ); // VorteX: load simple subtitle_text file @@ -240,7 +253,7 @@ clvideo_t* CL_OpenVideo( const char *filename, const char *name, int owner, cons video = FindUnusedVid(); if( !video ) { - Con_Printf( "CL_OpenVideo: unable to open video \"%s\" - video limit reached\n", filename ); + Con_Printf(CON_ERROR "CL_OpenVideo: unable to open video \"%s\" - video limit reached\n", filename ); return NULL; } video = OpenVideo( video, filename, name, owner, subtitlesfile ); @@ -263,7 +276,7 @@ static clvideo_t* CL_GetVideoBySlot( int slot ) video->framenum = -1; } - video->lasttime = realtime; + video->lasttime = host.realtime; return video; } @@ -274,7 +287,7 @@ clvideo_t *CL_GetVideoByName( const char *name ) for( i = 0 ; i < cl_num_videos ; i++ ) if( cl_videos[ i ].state != CLVIDEO_UNUSED - && !strcmp( cl_videos[ i ].cpif.name , name ) ) + && !strcmp( cl_videos[ i ].name , name ) ) break; if( i != cl_num_videos ) return CL_GetVideoBySlot( i ); @@ -287,7 +300,7 @@ void CL_SetVideoState(clvideo_t *video, clvideostate_t state) if (!video) return; - video->lasttime = realtime; + video->lasttime = host.realtime; video->state = state; if (state == CLVIDEO_FIRSTFRAME) CL_RestartVideo(video); @@ -299,11 +312,13 @@ void CL_RestartVideo(clvideo_t *video) return; // reset time - video->starttime = video->lasttime = realtime; + video->starttime = video->lasttime = host.realtime; video->framenum = -1; // reopen stream - video->close(video->stream); + if (video->stream) + video->close(video->stream); + video->stream = NULL; if (!OpenStream(video)) video->state = CLVIDEO_UNUSED; } @@ -318,7 +333,11 @@ void CL_CloseVideo(clvideo_t * video) // close stream if (!video->suspended || video->state != CLVIDEO_FIRSTFRAME) - video->close(video->stream); + { + if (video->stream) + video->close(video->stream); + video->stream = NULL; + } // unlink texture if (!video->suspended) UnlinkVideoTexture(video); @@ -345,28 +364,28 @@ void CL_Video_Frame(void) { if (video->state != CLVIDEO_UNUSED && !video->suspended) { - if (realtime - video->lasttime > CLTHRESHOLD) + if (host.realtime - video->lasttime > CLTHRESHOLD) { SuspendVideo(video); continue; } if (video->state == CLVIDEO_PAUSE) { - video->starttime = realtime - video->framenum * video->framerate; + video->starttime = host.realtime - video->framenum * video->framerate; continue; } // read video frame from stream if time has come if (video->state == CLVIDEO_FIRSTFRAME ) destframe = 0; else - destframe = (int)((realtime - video->starttime) * video->framerate); + destframe = (int)((host.realtime - video->starttime) * video->framerate); if (destframe < 0) destframe = 0; if (video->framenum < destframe) { do { video->framenum++; - if (video->decodeframe(video->stream, video->imagedata, cl_videormask, cl_videogmask, cl_videobmask, cl_videobytesperpixel, cl_videobytesperpixel * video->cpif.width)) + if (video->decodeframe(video->stream, video->imagedata, cl_videormask, cl_videogmask, cl_videobmask, cl_videobytesperpixel, cl_videobytesperpixel * video->width)) { // finished? CL_RestartVideo(video); @@ -375,7 +394,7 @@ void CL_Video_Frame(void) return; } } while(video->framenum < destframe); - R_MarkDirtyTexture(video->cpif.tex); + R_MarkDirtyTexture(Draw_GetPicTexture(video->cachepic)); } } } @@ -389,13 +408,6 @@ void CL_Video_Frame(void) cl_num_videos--; } -void CL_Video_Shutdown( void ) -{ - int i; - for (i = 0 ; i < cl_num_videos ; i++) - CL_CloseVideo(&cl_videos[ i ]); -} - void CL_PurgeOwner( int owner ) { int i; @@ -418,7 +430,7 @@ typedef struct } cl_video_subtitle_info_t; -float CL_DrawVideo_WordWidthFunc(void *passthrough, const char *w, size_t *length, float maxWidth) +static float CL_DrawVideo_WordWidthFunc(void *passthrough, const char *w, size_t *length, float maxWidth) { cl_video_subtitle_info_t *si = (cl_video_subtitle_info_t *) passthrough; @@ -432,7 +444,7 @@ float CL_DrawVideo_WordWidthFunc(void *passthrough, const char *w, size_t *lengt return 0; } -int CL_DrawVideo_DisplaySubtitleLine(void *passthrough, const char *line, size_t length, float width, qboolean isContinuation) +static int CL_DrawVideo_DisplaySubtitleLine(void *passthrough, const char *line, size_t length, float width, qbool isContinuation) { cl_video_subtitle_info_t *si = (cl_video_subtitle_info_t *) passthrough; @@ -474,7 +486,7 @@ void CL_DrawVideo(void) st[6] = 1.0; st[7] = 1.0; if (cl_video_keepaspectratio.integer) { - float a = ((float)video->cpif.width / (float)video->cpif.height) / ((float)vid.width / (float)vid.height); + float a = video->getaspectratio(video->stream) / ((float)vid.width / (float)vid.height); if (cl_video_keepaspectratio.integer >= 2) { // clip instead of scale @@ -512,50 +524,38 @@ void CL_DrawVideo(void) // calc brightness for fadein and fadeout effects b = cl_video_brightness.value; - if (cl_video_fadein.value && (realtime - video->starttime) < cl_video_fadein.value) - b = pow((realtime - video->starttime)/cl_video_fadein.value, 2); - else if (cl_video_fadeout.value && ((video->starttime + video->framenum * video->framerate) - realtime) < cl_video_fadeout.value) - b = pow(((video->starttime + video->framenum * video->framerate) - realtime)/cl_video_fadeout.value, 2); + if (cl_video_fadein.value && (host.realtime - video->starttime) < cl_video_fadein.value) + b = pow((host.realtime - video->starttime)/cl_video_fadein.value, 2); + else if (cl_video_fadeout.value && ((video->starttime + video->framenum * video->framerate) - host.realtime) < cl_video_fadeout.value) + b = pow(((video->starttime + video->framenum * video->framerate) - host.realtime)/cl_video_fadeout.value, 2); // draw black bg in case stipple is active or video is scaled if (cl_video_stipple.integer || px != 0 || py != 0 || sx != vid_conwidth.integer || sy != vid_conheight.integer) DrawQ_Fill(0, 0, vid_conwidth.integer, vid_conheight.integer, 0, 0, 0, 1, 0); -#ifndef USE_GLES2 // enable video-only polygon stipple (of global stipple is not active) - if (qglPolygonStipple && !scr_stipple.integer && cl_video_stipple.integer) + if (!scr_stipple.integer && cl_video_stipple.integer) { - GLubyte stipple[128]; - int i, s, width, parts; - - s = cl_video_stipple.integer; - parts = (s & 007); - width = (s & 070) >> 3; - qglEnable(GL_POLYGON_STIPPLE);CHECKGLERROR // 0x0B42 - for(i = 0; i < 128; ++i) - { - int line = i/4; - stipple[i] = ((line >> width) & ((1 << parts) - 1)) ? 0x00 : 0xFF; - } - qglPolygonStipple(stipple);CHECKGLERROR + Con_Print("FIXME: cl_video_stipple not implemented\n"); + Cvar_SetValueQuick(&cl_video_stipple, 0); } -#endif // draw video - DrawQ_SuperPic(px, py, &video->cpif, sx, sy, st[0], st[1], b, b, b, 1, st[2], st[3], b, b, b, 1, st[4], st[5], b, b, b, 1, st[6], st[7], b, b, b, 1, 0); - -#ifndef USE_GLES2 - // disable video-only stipple - if (qglPolygonStipple && !scr_stipple.integer && cl_video_stipple.integer) - qglDisable(GL_POLYGON_STIPPLE);CHECKGLERROR -#endif + if (v_glslgamma_video.value >= 1) + DrawQ_SuperPic(px, py, video->cachepic, sx, sy, st[0], st[1], b, b, b, 1, st[2], st[3], b, b, b, 1, st[4], st[5], b, b, b, 1, st[6], st[7], b, b, b, 1, 0); + else + { + DrawQ_SuperPic(px, py, video->cachepic, sx, sy, st[0], st[1], b, b, b, 1, st[2], st[3], b, b, b, 1, st[4], st[5], b, b, b, 1, st[6], st[7], b, b, b, 1, DRAWFLAG_NOGAMMA); + if (v_glslgamma_video.value > 0.0) + DrawQ_SuperPic(px, py, video->cachepic, sx, sy, st[0], st[1], b, b, b, v_glslgamma_video.value, st[2], st[3], b, b, b, v_glslgamma_video.value, st[4], st[5], b, b, b, v_glslgamma_video.value, st[6], st[7], b, b, b, v_glslgamma_video.value, 0); + } // VorteX: draw subtitle_text if (!video->subtitles || !cl_video_subtitles.integer) return; // find current subtitle - videotime = realtime - video->starttime; + videotime = host.realtime - video->starttime; for (i = 0; i < video->subtitles; i++) { if (videotime >= video->subtitle_start[i] && videotime <= video->subtitle_end[i]) @@ -577,12 +577,12 @@ void CL_DrawVideo(void) void CL_VideoStart(char *filename, const char *subtitlesfile) { - Host_StartVideo(); + CL_StartVideo(); if( cl_videos->state != CLVIDEO_UNUSED ) CL_CloseVideo( cl_videos ); // already contains video/ - if( !OpenVideo( cl_videos, filename, va( CLDYNTEXTUREPREFIX "%s", filename ), 0, subtitlesfile ) ) + if( !OpenVideo( cl_videos, filename, filename, 0, subtitlesfile ) ) return; // expand the active range to include the new entry cl_num_videos = max(cl_num_videos, 1); @@ -593,7 +593,7 @@ void CL_VideoStart(char *filename, const char *subtitlesfile) CL_RestartVideo( cl_videos ); } -void CL_Video_KeyEvent( int key, int ascii, qboolean down ) +void CL_Video_KeyEvent( int key, int ascii, qbool down ) { // only react to up events, to allow the user to delay the abortion point if it suddenly becomes interesting.. if( !down ) { @@ -610,37 +610,37 @@ void CL_VideoStop(void) CL_CloseVideo( cl_videos ); } -static void CL_PlayVideo_f(void) +static void CL_PlayVideo_f(cmd_state_t *cmd) { char name[MAX_QPATH], subtitlesfile[MAX_QPATH]; const char *extension; - Host_StartVideo(); + CL_StartVideo(); - if (COM_CheckParm("-benchmark")) + if (Sys_CheckParm("-benchmark")) return; - if (Cmd_Argc() < 2) + if (Cmd_Argc(cmd) < 2) { Con_Print("usage: playvideo [custom_subtitles_file]\nplays video named video/.dpv\nif custom subtitles file is not presented\nit tries video/.sub"); return; } - extension = FS_FileExtension(Cmd_Argv(1)); + extension = FS_FileExtension(Cmd_Argv(cmd, 1)); if (extension[0]) - dpsnprintf(name, sizeof(name), "video/%s", Cmd_Argv(1)); + dpsnprintf(name, sizeof(name), "video/%s", Cmd_Argv(cmd, 1)); else - dpsnprintf(name, sizeof(name), "video/%s.dpv", Cmd_Argv(1)); - if ( Cmd_Argc() > 2) - CL_VideoStart(name, Cmd_Argv(2)); + dpsnprintf(name, sizeof(name), "video/%s.dpv", Cmd_Argv(cmd, 1)); + if ( Cmd_Argc(cmd) > 2) + CL_VideoStart(name, Cmd_Argv(cmd, 2)); else { - dpsnprintf(subtitlesfile, sizeof(subtitlesfile), "video/%s.dpsubs", Cmd_Argv(1)); + dpsnprintf(subtitlesfile, sizeof(subtitlesfile), "video/%s.dpsubs", Cmd_Argv(cmd, 1)); CL_VideoStart(name, subtitlesfile); } } -static void CL_StopVideo_f(void) +static void CL_StopVideo_f(cmd_state_t *cmd) { CL_VideoStop(); } @@ -689,8 +689,8 @@ void CL_Video_Init( void ) bgra.i = 0;bgra.b[1] = 0xFF;cl_videogmask = bgra.i; bgra.i = 0;bgra.b[2] = 0xFF;cl_videormask = bgra.i; - Cmd_AddCommand( "playvideo", CL_PlayVideo_f, "play a .dpv video file" ); - Cmd_AddCommand( "stopvideo", CL_StopVideo_f, "stop playing a .dpv video file" ); + Cmd_AddCommand(CF_CLIENT, "playvideo", CL_PlayVideo_f, "play a .dpv video file" ); + Cmd_AddCommand(CF_CLIENT, "stopvideo", CL_StopVideo_f, "stop playing a .dpv video file" ); Cvar_RegisterVariable(&cl_video_subtitles); Cvar_RegisterVariable(&cl_video_subtitles_lines); @@ -703,5 +703,19 @@ void CL_Video_Init( void ) Cvar_RegisterVariable(&cl_video_fadein); Cvar_RegisterVariable(&cl_video_fadeout); + Cvar_RegisterVariable(&v_glslgamma_video); + R_RegisterModule( "CL_Video", cl_video_start, cl_video_shutdown, cl_video_newmap, NULL, NULL ); -} \ No newline at end of file + + LibAvW_OpenLibrary(); +} + +void CL_Video_Shutdown( void ) +{ + int i; + + for (i = 0 ; i < cl_num_videos ; i++) + CL_CloseVideo(&cl_videos[ i ]); + + LibAvW_CloseLibrary(); +}