]> de.git.xonotic.org Git - xonotic/darkplaces.git/blobdiff - cl_video.c
Fix setinfo.
[xonotic/darkplaces.git] / cl_video.c
index fabce36c33d626199edd0b9384d205969f0e77f0..9e5ca0d65016d2121250e022f079c39928fd32f7 100644 (file)
@@ -1,8 +1,32 @@
 
 #include "quakedef.h"
 #include "cl_video.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"};
+
+cvar_t v_glslgamma_video = {CVAR_SAVE, "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: libavcodec implementation
+#include "cl_video_libavw.c"
+
+// JAM video decoder used by Blood Omnicide
+#ifdef JAMVIDEO
+#include "cl_video_jamdecode.c"
+#endif
+
 // constants (and semi-constants)
 static int  cl_videormask;
 static int  cl_videobmask;
@@ -24,28 +48,60 @@ static clvideo_t *FindUnusedVid( void )
 
 static qboolean OpenStream( clvideo_t * video )
 {
-       char *errorstring;
-       video->stream = dpvsimpledecode_open( video->filename, &errorstring);
-       if (!video->stream )
-       {
-               Con_Printf("unable to open \"%s\", error: %s\n", video->filename, errorstring);
-               return false;
-       }
-       return true;
+       const char *errorstring;
+
+       video->stream = dpvsimpledecode_open( video, video->filename, &errorstring);
+       if (video->stream)
+               return true;
+
+#ifdef JAMVIDEO
+       video->stream = jam_open( video, video->filename, &errorstring);
+       if (video->stream)
+               return true;
+#endif
+
+       video->stream = LibAvW_OpenVideo( video, video->filename, &errorstring);
+       if (video->stream)
+               return true;
+
+       Con_Printf("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;
+       Draw_NewPic(video->name, video->width, video->height, (unsigned char *)video->imagedata, TEXTYPE_BGRA, TEXF_CLAMP);
+}
+
+static void LinkVideoTexture( clvideo_t *video )
+{
+       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 )
+{
+       // 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 );
 }
 
 static void SuspendVideo( clvideo_t * video )
 {
-       if( video->suspended )
+       if (video->suspended)
                return;
        video->suspended = true;
-       // free the texture
-       R_FreeTexture( video->cpif.tex );
-       // free the image data
-       Mem_Free( video->imagedata );
+       UnlinkVideoTexture(video);
        // if we are in firstframe mode, also close the stream
-       if( video->state == CLVIDEO_FIRSTFRAME )
-               dpvsimpledecode_close( video->stream );
+       if (video->state == CLVIDEO_FIRSTFRAME)
+       {
+               if (video->stream)
+                       video->close(video->stream);
+               video->stream = NULL;
+       }
 }
 
 static qboolean WakeVideo( clvideo_t * video )
@@ -60,9 +116,8 @@ static qboolean WakeVideo( clvideo_t * video )
                        return false;
                }
 
-       video->imagedata = Mem_Alloc( cls.permanentmempool, video->cpif.width * video->cpif.height * cl_videobytesperpixel );
-       video->cpif.tex = R_LoadTexture2D( cl_videotexturepool, video->cpif.name,
-               video->cpif.width, video->cpif.height, NULL, TEXTYPE_RGBA, TEXF_ALWAYSPRECACHE, NULL );
+       video->imagedata = Mem_Alloc( cls.permanentmempool, video->width * video->height * cl_videobytesperpixel );
+       LinkVideoTexture( video );
 
        // update starttime
        video->starttime += realtime - video->lasttime;
@@ -70,45 +125,142 @@ static qboolean WakeVideo( clvideo_t * video )
        return true;
 }
 
-static clvideo_t* OpenVideo( clvideo_t *video, const char *filename, const char *name, int owner )
+static void LoadSubtitles( clvideo_t *video, const char *subtitlesfile )
 {
-       strncpy( video->filename, filename, MAX_QPATH );
+       char *subtitle_text;
+       const char *data;
+       float subtime, sublen;
+       int numsubs = 0;
+
+       if (gamemode == GAME_BLOODOMNICIDE)
+       {
+               char overridename[MAX_QPATH];
+               cvar_t *langcvar;
+
+               langcvar = Cvar_FindVar("language");
+               subtitle_text = NULL;
+               if (langcvar)
+               {
+                       dpsnprintf(overridename, sizeof(overridename), "locale/%s/%s", langcvar->string, subtitlesfile);
+                       subtitle_text = (char *)FS_LoadFile(overridename, cls.permanentmempool, false, NULL);
+               }
+               if (!subtitle_text)
+                       subtitle_text = (char *)FS_LoadFile(subtitlesfile, cls.permanentmempool, false, NULL);
+       }
+       else
+       {
+               subtitle_text = (char *)FS_LoadFile(subtitlesfile, cls.permanentmempool, false, NULL);
+       }
+       if (!subtitle_text)
+       {
+               Con_DPrintf( "LoadSubtitles: can't open subtitle file '%s'!\n", subtitlesfile );
+               return;
+       }
+
+       // parse subtitle_text
+       // line is: x y "text" where
+       //    x - start time
+       //    y - seconds last (if 0 - last thru next sub, if negative - last to next sub - this amount of seconds)
+
+       data = subtitle_text;
+       for (;;)
+       {
+               if (!COM_ParseToken_QuakeC(&data, false))
+                       break;
+               subtime = atof( com_token );
+               if (!COM_ParseToken_QuakeC(&data, false))
+                       break;
+               sublen = atof( com_token );
+               if (!COM_ParseToken_QuakeC(&data, false))
+                       break;
+               if (!com_token[0])
+                       continue;
+               // 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);
+                       break;  
+               }
+               // add a sub
+               video->subtitle_text[numsubs] = (char *) Mem_Alloc(cls.permanentmempool, strlen(com_token) + 1);
+               memcpy(video->subtitle_text[numsubs], com_token, strlen(com_token) + 1);
+               video->subtitle_start[numsubs] = subtime;
+               video->subtitle_end[numsubs] = sublen;
+               if (numsubs > 0) // make true len for prev sub, autofix overlapping subtitles
+               {
+                       if (video->subtitle_end[numsubs-1] <= 0)
+                               video->subtitle_end[numsubs-1] = max(video->subtitle_start[numsubs-1], video->subtitle_start[numsubs] + video->subtitle_end[numsubs-1]);
+                       else
+                               video->subtitle_end[numsubs-1] = min(video->subtitle_start[numsubs-1] + video->subtitle_end[numsubs-1], video->subtitle_start[numsubs]);
+               }
+               numsubs++;
+               // todo: check timing for consistency?
+       }
+       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?
+               else
+                       video->subtitle_end[numsubs-1] = video->subtitle_start[numsubs-1] + video->subtitle_end[numsubs-1];
+       }
+       Z_Free( subtitle_text );
+       video->subtitles = numsubs;
+/*
+       Con_Printf( "video->subtitles: %i\n", video->subtitles );
+       for (numsubs = 0; numsubs < video->subtitles; numsubs++)
+               Con_Printf( "  %03.2f %03.2f : %s\n", video->subtitle_start[numsubs], video->subtitle_end[numsubs], video->subtitle_text[numsubs] );
+*/
+}
+
+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));
+       dpsnprintf(video->name, sizeof(video->name), CLVIDEOPREFIX "%s", name);
        video->ownertag = owner;
        if( strncmp( name, CLVIDEOPREFIX, sizeof( CLVIDEOPREFIX ) - 1 ) )
                return NULL;
-       strncpy( video->cpif.name, name, MAX_QPATH );
+       video->cachepic = Draw_CachePic_Flags(name, CACHEPICFLAG_NOTPERSISTENT | CACHEPICFLAG_QUIET);
 
        if( !OpenStream( video ) )
                return NULL;
 
        video->state = CLVIDEO_FIRSTFRAME;
        video->framenum = -1;
-       video->framerate = dpvsimpledecode_getframerate( video->stream );
+       video->framerate = video->getframerate( video->stream );
        video->lasttime = realtime;
+       video->subtitles = 0;
 
-       video->cpif.width = dpvsimpledecode_getwidth( video->stream );
-       video->cpif.height = dpvsimpledecode_getheight( video->stream );
-       video->cpif.tex = R_LoadTexture2D( cl_videotexturepool, video->cpif.name,
-               video->cpif.width, video->cpif.height, NULL, TEXTYPE_RGBA, TEXF_ALWAYSPRECACHE, NULL );
+       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 );
 
-    video->imagedata = Mem_Alloc( cls.permanentmempool, video->cpif.width * video->cpif.height * cl_videobytesperpixel );
+       // VorteX: load simple subtitle_text file
+       if (subtitlesfile[0])
+               LoadSubtitles( video, subtitlesfile );
 
        return video;
 }
 
-clvideo_t* CL_OpenVideo( const char *filename, const char *name, int owner )
+clvideo_t* CL_OpenVideo( const char *filename, const char *name, int owner, const char *subtitlesfile )
 {
        clvideo_t *video;
+       // sanity check
+       if( !name || !*name || strncmp( name, CLVIDEOPREFIX, sizeof( CLVIDEOPREFIX ) - 1 ) != 0 ) {
+               Con_DPrintf( "CL_OpenVideo: Bad video texture name '%s'!\n", name );
+               return NULL;
+       }
 
        video = FindUnusedVid();
        if( !video ) {
-               Con_Printf( "unable to open video \"%s\" - video limit reached\n", filename );
+               Con_Printf( "CL_OpenVideo: unable to open video \"%s\" - video limit reached\n", filename );
                return NULL;
        }
-       video = OpenVideo( video, filename, name, owner );
+       video = OpenVideo( video, filename, name, owner, subtitlesfile );
        // expand the active range to include the new entry
-       if (video)
+       if (video) {
                cl_num_videos = max(cl_num_videos, (int)(video - cl_videos) + 1);
+       }
        return video;
 }
 
@@ -135,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 );
@@ -143,129 +295,294 @@ clvideo_t *CL_GetVideoByName( const char *name )
                return NULL;
 }
 
-void CL_SetVideoState( clvideo_t *video, clvideostate_t state )
+void CL_SetVideoState(clvideo_t *video, clvideostate_t state)
 {
-       if( !video )
+       if (!video)
                return;
 
        video->lasttime = realtime;
        video->state = state;
-       if( state == CLVIDEO_FIRSTFRAME )
-               CL_RestartVideo( video );
+       if (state == CLVIDEO_FIRSTFRAME)
+               CL_RestartVideo(video);
 }
 
-void CL_RestartVideo( clvideo_t *video )
+void CL_RestartVideo(clvideo_t *video)
 {
-       if( !video )
+       if (!video)
                return;
 
+       // reset time
        video->starttime = video->lasttime = realtime;
        video->framenum = -1;
 
-       dpvsimpledecode_close( video->stream );
-       if( !OpenStream( video ) )
+       // reopen stream
+       if (video->stream)
+               video->close(video->stream);
+       video->stream = NULL;
+       if (!OpenStream(video))
                video->state = CLVIDEO_UNUSED;
 }
 
-void CL_CloseVideo( clvideo_t * video )
+// close video
+void CL_CloseVideo(clvideo_t * video)
 {
-       if( !video || video->state == CLVIDEO_UNUSED )
+       int i;
+
+       if (!video || video->state == CLVIDEO_UNUSED)
                return;
 
-       if( !video->suspended || video->state != CLVIDEO_FIRSTFRAME )
-               dpvsimpledecode_close( video->stream );
-       if( !video->suspended ) {
-               Mem_Free( video->imagedata );
-               R_FreeTexture( video->cpif.tex );
+       // close stream
+       if (!video->suspended || video->state != CLVIDEO_FIRSTFRAME)
+       {
+               if (video->stream)
+                       video->close(video->stream);
+               video->stream = NULL;
+       }
+       // unlink texture
+       if (!video->suspended)
+               UnlinkVideoTexture(video);
+       // purge subtitles
+       if (video->subtitles)
+       {
+               for (i = 0; i < video->subtitles; i++)
+                       Z_Free( video->subtitle_text[i] );
+               video->subtitles = 0;
        }
-
        video->state = CLVIDEO_UNUSED;
 }
 
-static void VideoFrame( clvideo_t *video )
+// update all videos
+void CL_Video_Frame(void) 
 {
+       clvideo_t *video;
        int destframe;
-
-       if( video->state == CLVIDEO_FIRSTFRAME )
-               destframe = 0;
-       else
-               destframe = (realtime - video->starttime) * video->framerate;
-       if( destframe < 0 )
-               destframe = 0;
-       if( video->framenum < destframe ) {
-               do {
-                       video->framenum++;
-                       if( dpvsimpledecode_video( video->stream, video->imagedata, cl_videormask,
-                               cl_videogmask, cl_videobmask, cl_videobytesperpixel,
-                               cl_videobytesperpixel * video->cpif.width )
-                               ) { // finished?
-                               CL_RestartVideo( video );
-                               if( video->state == CLVIDEO_PLAY )
-                                               video->state = CLVIDEO_FIRSTFRAME;
-                               return;
-                       }
-               } while( video->framenum < destframe );
-               R_UpdateTexture( video->cpif.tex, (unsigned char *)video->imagedata, 0, 0, video->cpif.width, video->cpif.height );
-       }
-}
-
-void CL_VideoFrame( void ) // update all videos
-{
        int i;
-       clvideo_t *video;
 
        if (!cl_num_videos)
                return;
-
-       for( video = cl_videos, i = 0 ; i < cl_num_videos ; video++, i++ )
-               if( video->state != CLVIDEO_UNUSED && !video->suspended )
+       for (video = cl_videos, i = 0 ; i < cl_num_videos ; video++, i++)
+       {
+               if (video->state != CLVIDEO_UNUSED && !video->suspended)
                {
-                       if( realtime - video->lasttime > CLTHRESHOLD )
-                               SuspendVideo( video );
-                       else if( video->state == CLVIDEO_PAUSE )
+                       if (realtime - video->lasttime > CLTHRESHOLD)
+                       {
+                               SuspendVideo(video);
+                               continue;
+                       }
+                       if (video->state == CLVIDEO_PAUSE)
+                       {
                                video->starttime = realtime - video->framenum * video->framerate;
+                               continue;
+                       }
+                       // read video frame from stream if time has come
+                       if (video->state == CLVIDEO_FIRSTFRAME )
+                               destframe = 0;
                        else
-                               VideoFrame( video );
+                               destframe = (int)((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->width))
+                                       { 
+                                               // finished?
+                                               CL_RestartVideo(video);
+                                               if (video->state == CLVIDEO_PLAY)
+                                                       video->state = CLVIDEO_FIRSTFRAME;
+                                               return;
+                                       }
+                               } while(video->framenum < destframe);
+                               R_MarkDirtyTexture(Draw_GetPicTexture(video->cachepic));
+                       }
                }
+       }
 
-       if( cl_videos->state == CLVIDEO_FIRSTFRAME )
+       // stop main video
+       if (cl_videos->state == CLVIDEO_FIRSTFRAME)
                CL_VideoStop();
 
        // reduce range to exclude unnecessary entries
-       while (cl_num_videos > 0 && cl_videos[cl_num_videos-1].state == CLVIDEO_UNUSED)
+       while(cl_num_videos > 0 && cl_videos[cl_num_videos-1].state == CLVIDEO_UNUSED)
                cl_num_videos--;
 }
 
-void CL_Video_Shutdown( void )
+void CL_PurgeOwner( int owner )
 {
        int i;
-       for( i = 0 ; i < cl_num_videos ; i++ )
-               CL_CloseVideo( &cl_videos[ i ] );
+
+       for (i = 0 ; i < cl_num_videos ; i++)
+               if (cl_videos[i].ownertag == owner)
+                       CL_CloseVideo(&cl_videos[i]);
 }
 
-void CL_PurgeOwner( int owner )
+typedef struct
 {
-       int i;
-       for( i = 0 ; i < cl_num_videos ; i++ )
-               if( cl_videos[ i ].ownertag == owner )
-                       CL_CloseVideo( &cl_videos[ i ] );
+       dp_font_t *font;
+       float x;
+       float y;
+       float width;
+       float height;
+       float alignment; // 0 = left, 0.5 = center, 1 = right
+       float fontsize;
+       float textalpha;
+}
+cl_video_subtitle_info_t;
+
+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;
+
+       if(w == NULL)
+               return si->fontsize * si->font->maxwidth;
+       if(maxWidth >= 0)
+               return DrawQ_TextWidth_UntilWidth(w, length, si->fontsize, si->fontsize, false, si->font, -maxWidth); // -maxWidth: we want at least one char
+       else if(maxWidth == -1)
+               return DrawQ_TextWidth(w, *length, si->fontsize, si->fontsize, false, si->font);
+       else
+               return 0;
+}
+
+static int CL_DrawVideo_DisplaySubtitleLine(void *passthrough, const char *line, size_t length, float width, qboolean isContinuation)
+{
+       cl_video_subtitle_info_t *si = (cl_video_subtitle_info_t *) passthrough;
+
+       int x = (int) (si->x + (si->width - width) * si->alignment);
+       if (length > 0)
+               DrawQ_String(x, si->y, line, length, si->fontsize, si->fontsize, 1.0, 1.0, 1.0, si->textalpha, 0, NULL, false, si->font);
+       si->y += si->fontsize;
+       return 1;
 }
 
 int cl_videoplaying = false; // old, but still supported
 
 void CL_DrawVideo(void)
 {
-       if (cl_videoplaying)
-               DrawQ_Pic(0, 0, &CL_GetVideoBySlot( 0 )->cpif, vid_conwidth.integer, vid_conheight.integer, 1, 1, 1, 1, 0);
+       clvideo_t *video;
+       float videotime, px, py, sx, sy, st[8], b;
+       cl_video_subtitle_info_t si;
+       int i;
+
+       if (!cl_videoplaying)
+               return;
+
+       video = CL_GetVideoBySlot( 0 );
+
+       // fix cvars
+       if (cl_video_scale.value <= 0 || cl_video_scale.value > 1)
+               Cvar_SetValueQuick( &cl_video_scale, 1);
+       if (cl_video_brightness.value <= 0 || cl_video_brightness.value > 10)
+               Cvar_SetValueQuick( &cl_video_brightness, 1);
+
+       // calc video proportions
+       px = 0;
+       py = 0;
+       sx = vid_conwidth.integer;
+       sy = vid_conheight.integer;
+       st[0] = 0.0; st[1] = 0.0; 
+       st[2] = 1.0; st[3] = 0.0; 
+       st[4] = 0.0; st[5] = 1.0; 
+       st[6] = 1.0; st[7] = 1.0; 
+       if (cl_video_keepaspectratio.integer)
+       {
+               float a = video->getaspectratio(video->stream) / ((float)vid.width / (float)vid.height);
+               if (cl_video_keepaspectratio.integer >= 2)
+               {
+                       // clip instead of scale
+                       if (a < 1.0) // clip horizontally
+                       {
+                               st[1] = st[3] = (1 - a)*0.5;
+                               st[5] = st[7] = 1 - (1 - a)*0.5;
+                       }
+                       else if (a > 1.0) // clip vertically
+                       {
+                               st[0] = st[4] = (1 - 1/a)*0.5;
+                               st[2] = st[6] = (1/a)*0.5;
+                       }
+               }
+               else if (a < 1.0) // scale horizontally
+               {
+                       px += sx * (1 - a) * 0.5;
+                       sx *= a;
+               }
+               else if (a > 1.0) // scale vertically
+               {
+                       a = 1 / a;
+                       py += sy * (1 - a);
+                       sy *= a;
+               }
+       }
+
+       if (cl_video_scale.value != 1)
+       {
+               px += sx * (1 - cl_video_scale.value) * 0.5;
+               py += sy * (1 - cl_video_scale.value) * ((bound(-1, cl_video_scale_vpos.value, 1) + 1) / 2);
+               sx *= cl_video_scale.value;
+               sy *= cl_video_scale.value;
+       }
+
+       // 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);
+
+       // 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);
+
+       // enable video-only polygon stipple (of global stipple is not active)
+       if (!scr_stipple.integer && cl_video_stipple.integer)
+       {
+               Con_Print("FIXME: cl_video_stipple not implemented\n");
+               Cvar_SetValueQuick(&cl_video_stipple, 0);
+       }
+
+       // draw video
+       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;
+       for (i = 0; i < video->subtitles; i++)
+       {
+               if (videotime >= video->subtitle_start[i] && videotime <= video->subtitle_end[i])
+               {
+                       // found, draw it
+                       si.font = FONT_NOTIFY;
+                       si.x = vid_conwidth.integer * 0.1;
+                       si.y = vid_conheight.integer - (max(1, cl_video_subtitles_lines.value) * cl_video_subtitles_textsize.value);
+                       si.width = vid_conwidth.integer * 0.8;
+                       si.height = max(1, cl_video_subtitles_lines.integer) * cl_video_subtitles_textsize.value;
+                       si.alignment = 0.5;
+                       si.fontsize = cl_video_subtitles_textsize.value;
+                       si.textalpha = min(1, (videotime - video->subtitle_start[i])/0.5) * min(1, ((video->subtitle_end[i] - videotime)/0.3)); // fade in and fade out
+                       COM_Wordwrap(video->subtitle_text[i], strlen(video->subtitle_text[i]), 0, si.width, CL_DrawVideo_WordWidthFunc, &si, CL_DrawVideo_DisplaySubtitleLine, &si);
+                       break;
+               }
+       }
 }
 
-void CL_VideoStart(char *filename)
+void CL_VideoStart(char *filename, const char *subtitlesfile)
 {
        Host_StartVideo();
 
        if( cl_videos->state != CLVIDEO_UNUSED )
                CL_CloseVideo( cl_videos );
-       if( !OpenVideo( cl_videos, filename, va( CLVIDEOPREFIX "%s", filename ), 0 ) )
+       // already contains video/
+       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);
@@ -276,6 +593,16 @@ void CL_VideoStart(char *filename)
        CL_RestartVideo( cl_videos );
 }
 
+void CL_Video_KeyEvent( int key, int ascii, qboolean down ) 
+{
+       // only react to up events, to allow the user to delay the abortion point if it suddenly becomes interesting..
+       if( !down ) {
+               if( key == K_ESCAPE || key == K_ENTER || key == K_SPACE ) {
+                       CL_VideoStop();
+               }
+       }
+}
+
 void CL_VideoStop(void)
 {
        cl_videoplaying = false;
@@ -285,18 +612,32 @@ void CL_VideoStop(void)
 
 static void CL_PlayVideo_f(void)
 {
-       char name[MAX_QPATH];
+       char name[MAX_QPATH], subtitlesfile[MAX_QPATH];
+       const char *extension;
 
        Host_StartVideo();
 
-       if (Cmd_Argc() != 2)
+       if (COM_CheckParm("-benchmark"))
+               return;
+
+       if (Cmd_Argc() < 2)
        {
-               Con_Print("usage: playvideo <videoname>\nplays video named video/<videoname>.dpv\n");
+               Con_Print("usage: playvideo <videoname> [custom_subtitles_file]\nplays video named video/<videoname>.dpv\nif custom subtitles file is not presented\nit tries video/<videoname>.sub");
                return;
        }
 
-       sprintf(name, "video/%s.dpv", Cmd_Argv(1));
-       CL_VideoStart(name);
+       extension = FS_FileExtension(Cmd_Argv(1));
+       if (extension[0])
+               dpsnprintf(name, sizeof(name), "video/%s", Cmd_Argv(1));
+       else
+               dpsnprintf(name, sizeof(name), "video/%s.dpv", Cmd_Argv(1));
+       if ( Cmd_Argc() > 2)
+               CL_VideoStart(name, Cmd_Argv(2));
+       else
+       {
+               dpsnprintf(subtitlesfile, sizeof(subtitlesfile), "video/%s.dpsubs", Cmd_Argv(1));
+               CL_VideoStart(name, subtitlesfile);
+       }
 }
 
 static void CL_StopVideo_f(void)
@@ -313,12 +654,17 @@ static void cl_video_start( void )
 
        for( video = cl_videos, i = 0 ; i < cl_num_videos ; i++, video++ )
                if( video->state != CLVIDEO_UNUSED && !video->suspended )
-                       video->cpif.tex = R_LoadTexture2D( cl_videotexturepool, video->cpif.name,
-                               video->cpif.width, video->cpif.height, NULL, TEXTYPE_RGBA, TEXF_ALWAYSPRECACHE, NULL );
+                       LinkVideoTexture( video );
 }
 
 static void cl_video_shutdown( void )
 {
+       int i;
+       clvideo_t *video;
+
+       for( video = cl_videos, i = 0 ; i < cl_num_videos ; i++, video++ )
+               if( video->state != CLVIDEO_UNUSED && !video->suspended )
+                       SuspendVideo( video );
        R_FreeTexturePool( &cl_videotexturepool );
 }
 
@@ -328,15 +674,48 @@ static void cl_video_newmap( void )
 
 void CL_Video_Init( void )
 {
+       union
+       {
+               unsigned char b[4];
+               unsigned int i;
+       }
+       bgra;
+
        cl_num_videos = 0;
        cl_videobytesperpixel = 4;
-       cl_videormask = BigLong(0xFF000000);
-       cl_videogmask = BigLong(0x00FF0000);
-       cl_videobmask = BigLong(0x0000FF00);
+
+       // set masks in an endian-independent way (as they really represent bytes)
+       bgra.i = 0;bgra.b[0] = 0xFF;cl_videobmask = bgra.i;
+       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" );
 
-       R_RegisterModule( "CL_Video", cl_video_start, cl_video_shutdown, cl_video_newmap );
+       Cvar_RegisterVariable(&cl_video_subtitles);
+       Cvar_RegisterVariable(&cl_video_subtitles_lines);
+       Cvar_RegisterVariable(&cl_video_subtitles_textsize);
+       Cvar_RegisterVariable(&cl_video_scale);
+       Cvar_RegisterVariable(&cl_video_scale_vpos);
+       Cvar_RegisterVariable(&cl_video_brightness);
+       Cvar_RegisterVariable(&cl_video_stipple);
+       Cvar_RegisterVariable(&cl_video_keepaspectratio);
+       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 );
+
+       LibAvW_OpenLibrary();
 }
 
+void CL_Video_Shutdown( void )
+{
+       int i;
+
+       for (i = 0 ; i < cl_num_videos ; i++)
+               CL_CloseVideo(&cl_videos[ i ]);
+
+       LibAvW_CloseLibrary();
+}