X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=cl_video.c;h=a9f2fc4df6564d6f817c3b924acec305ea9e08c3;hb=682c13beba95014c89c25f8ebec398a32a831d83;hp=5f56b889014c50308f5b9d4701c466be6144fb56;hpb=c1272e4849f43abafecd41b29dd97e01858a7b75;p=xonotic%2Fdarkplaces.git

diff --git a/cl_video.c b/cl_video.c
index 5f56b889..a9f2fc4d 100644
--- a/cl_video.c
+++ b/cl_video.c
@@ -1,5 +1,6 @@
 
 #include "quakedef.h"
+#include "cl_dyntexture.h"
 #include "cl_video.h"
 #include "dpvsimpledecode.h"
 
@@ -34,15 +35,32 @@ static qboolean OpenStream( clvideo_t * video )
 	return true;
 }
 
+static void VideoUpdateCallback(rtexture_t *rt, void *data) {
+	clvideo_t *video = data;
+	R_UpdateTexture( video->cpif.tex, (unsigned char *)video->imagedata, 0, 0, video->cpif.width, video->cpif.height );
+}
+
+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_ALWAYSPRECACHE | TEXF_PERSISTENT, NULL );
+	R_MakeTextureDynamic( video->cpif.tex, VideoUpdateCallback, video );
+	CL_LinkDynTexture( video->cpif.name, video->cpif.tex );
+}
+
+static void UnlinkVideoTexture( clvideo_t *video ) {
+	CL_UnlinkDynTexture( video->cpif.name );
+	// free the texture
+	R_FreeTexture( video->cpif.tex );
+	// free the image data
+	Mem_Free( video->imagedata );
+}
+
 static void SuspendVideo( clvideo_t * video )
 {
 	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 );
@@ -61,8 +79,7 @@ static qboolean WakeVideo( clvideo_t * video )
 		}
 
 	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, 0, NULL );
+	LinkVideoTexture( video );
 
 	// update starttime
 	video->starttime += realtime - video->lasttime;
@@ -72,11 +89,11 @@ static qboolean WakeVideo( clvideo_t * video )
 
 static clvideo_t* OpenVideo( clvideo_t *video, const char *filename, const char *name, int owner )
 {
-	strncpy( video->filename, filename, MAX_QPATH );
+	strlcpy( video->filename, filename, sizeof(video->filename) );
 	video->ownertag = owner;
 	if( strncmp( name, CLVIDEOPREFIX, sizeof( CLVIDEOPREFIX ) - 1 ) )
 		return NULL;
-	strncpy( video->cpif.name, name, MAX_QPATH );
+	strlcpy( video->cpif.name, name, sizeof(video->cpif.name) );
 
 	if( !OpenStream( video ) )
 		return NULL;
@@ -88,10 +105,8 @@ static clvideo_t* OpenVideo( clvideo_t *video, const char *filename, const char
 
 	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, 0, NULL );
-
-    video->imagedata = Mem_Alloc( cls.permanentmempool, video->cpif.width * video->cpif.height * cl_videobytesperpixel );
+	video->imagedata = Mem_Alloc( cls.permanentmempool, video->cpif.width * video->cpif.height * cl_videobytesperpixel );
+	LinkVideoTexture( video );
 
 	return video;
 }
@@ -99,16 +114,24 @@ static clvideo_t* OpenVideo( clvideo_t *video, const char *filename, const char
 clvideo_t* CL_OpenVideo( const char *filename, const char *name, int owner )
 {
 	clvideo_t *video;
+	// sanity check
+	if( !name || !*name || strncmp( name, CLVIDEOPREFIX, sizeof( CLVIDEOPREFIX ) - 1 ) != 0 ) {
+		if( developer.integer > 0 ) {
+			Con_Printf( "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 );
 	// 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;
 }
 
@@ -175,8 +198,7 @@ void CL_CloseVideo( clvideo_t * video )
 	if( !video->suspended || video->state != CLVIDEO_FIRSTFRAME )
 		dpvsimpledecode_close( video->stream );
 	if( !video->suspended ) {
-		Mem_Free( video->imagedata );
-		R_FreeTexture( video->cpif.tex );
+		UnlinkVideoTexture( video );
 	}
 
 	video->state = CLVIDEO_UNUSED;
@@ -189,7 +211,7 @@ static void VideoFrame( clvideo_t *video )
 	if( video->state == CLVIDEO_FIRSTFRAME )
 		destframe = 0;
 	else
-		destframe = (realtime - video->starttime) * video->framerate;
+		destframe = (int)((realtime - video->starttime) * video->framerate);
 	if( destframe < 0 )
 		destframe = 0;
 	if( video->framenum < destframe ) {
@@ -205,11 +227,11 @@ static void VideoFrame( clvideo_t *video )
 				return;
 			}
 		} while( video->framenum < destframe );
-		R_UpdateTexture( video->cpif.tex, (unsigned char *)video->imagedata, 0, 0, video->cpif.width, video->cpif.height );
+		R_MarkDirtyTexture( video->cpif.tex );
 	}
 }
 
-void CL_VideoFrame( void ) // update all videos
+void CL_Video_Frame( void ) // update all videos
 {
 	int i;
 	clvideo_t *video;
@@ -265,7 +287,8 @@ void CL_VideoStart(char *filename)
 
 	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, va( CLDYNTEXTUREPREFIX "%s", filename ), 0 ) )
 		return;
 	// expand the active range to include the new entry
 	cl_num_videos = max(cl_num_videos, 1);
@@ -276,6 +299,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;
@@ -313,12 +346,12 @@ 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, 0, NULL );
+			LinkVideoTexture( video );
 }
 
 static void cl_video_shutdown( void )
 {
+	// TODO: unlink video textures?
 	R_FreeTexturePool( &cl_videotexturepool );
 }
 
@@ -328,11 +361,20 @@ 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" );