X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;ds=sidebyside;f=cl_video.c;h=8e51872864f2945c8838dc84d67570948bb1affd;hb=a1295dca545c58fcdfc4dfae84bf838c1c06ada0;hp=64e023070ee1adf3cbc4506de68a8107a6d9de75;hpb=b0d02f8fd54c06d0706c185ab86250c3a696e5b3;p=xonotic%2Fdarkplaces.git

diff --git a/cl_video.c b/cl_video.c
index 64e02307..8e518728 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"
 
@@ -9,16 +10,16 @@ static int  cl_videobmask;
 static int  cl_videogmask;
 static int	cl_videobytesperpixel;
 
-static int cl_activevideos;
-static clvideo_t videoarray[ MAXCLVIDEOS ];
+static int cl_num_videos;
+static clvideo_t cl_videos[ MAXCLVIDEOS ];
 static rtexturepool_t *cl_videotexturepool;
 
 static clvideo_t *FindUnusedVid( void )
 {
 	int i;
 	for( i = 1 ; i < MAXCLVIDEOS ; i++ )
-		if( videoarray[ i ].state == CLVIDEO_UNUSED )
-			return &videoarray[ i ];
+		if( cl_videos[ i ].state == CLVIDEO_UNUSED )
+			return &cl_videos[ i ];
 	return NULL;
 }
 
@@ -34,15 +35,32 @@ static qboolean OpenStream( clvideo_t * video )
 	return true;
 }
 
+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, 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_PERSISTENT | TEXF_ALLOWUPDATES, 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 );
@@ -60,9 +78,8 @@ static qboolean WakeVideo( clvideo_t * video )
 			return false;
 		}
 
-	video->imagedata = Mem_Alloc( cl_mempool, 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 );
+	video->imagedata = Mem_Alloc( cls.permanentmempool, video->cpif.width * video->cpif.height * cl_videobytesperpixel );
+	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( cl_mempool, 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,22 +114,30 @@ 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)
-		cl_activevideos = max(cl_activevideos, (int)(video - videoarray) + 1);
+	if (video) {
+		cl_num_videos = max(cl_num_videos, (int)(video - cl_videos) + 1);
+	}
 	return video;
 }
 
 static clvideo_t* CL_GetVideoBySlot( int slot )
 {
-	clvideo_t *video = &videoarray[ slot ];
+	clvideo_t *video = &cl_videos[ slot ];
 
 	if( video->suspended )
 	{
@@ -133,11 +156,11 @@ clvideo_t *CL_GetVideoByName( const char *name )
 {
 	int i;
 
-	for( i = 0 ; i < cl_activevideos ; i++ )
-		if( videoarray[ i ].state != CLVIDEO_UNUSED
-			&&	!strcmp( videoarray[ i ].cpif.name , name ) )
+	for( i = 0 ; i < cl_num_videos ; i++ )
+		if( cl_videos[ i ].state != CLVIDEO_UNUSED
+			&&	!strcmp( cl_videos[ i ].cpif.name , name ) )
 			break;
-	if( i != cl_activevideos )
+	if( i != cl_num_videos )
 		return CL_GetVideoBySlot( i );
 	else
 		return NULL;
@@ -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,19 +227,19 @@ static void VideoFrame( clvideo_t *video )
 				return;
 			}
 		} while( video->framenum < destframe );
-		R_UpdateTexture( video->cpif.tex, (unsigned char *)video->imagedata );
+		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;
 
-	if (!cl_activevideos)
+	if (!cl_num_videos)
 		return;
 
-	for( video = videoarray, i = 0 ; i < cl_activevideos ; video++, i++ )
+	for( video = cl_videos, i = 0 ; i < cl_num_videos ; video++, i++ )
 		if( video->state != CLVIDEO_UNUSED && !video->suspended )
 		{
 			if( realtime - video->lasttime > CLTHRESHOLD )
@@ -228,27 +250,27 @@ void CL_VideoFrame( void ) // update all videos
 				VideoFrame( video );
 		}
 
-	if( videoarray->state == CLVIDEO_FIRSTFRAME )
+	if( cl_videos->state == CLVIDEO_FIRSTFRAME )
 		CL_VideoStop();
 
 	// reduce range to exclude unnecessary entries
-	while (cl_activevideos > 0 && videoarray[cl_activevideos-1].state == CLVIDEO_UNUSED)
-		cl_activevideos--;
+	while (cl_num_videos > 0 && cl_videos[cl_num_videos-1].state == CLVIDEO_UNUSED)
+		cl_num_videos--;
 }
 
 void CL_Video_Shutdown( void )
 {
 	int i;
-	for( i = 0 ; i < cl_activevideos ; i++ )
-		CL_CloseVideo( &videoarray[ i ] );
+	for( i = 0 ; i < cl_num_videos ; i++ )
+		CL_CloseVideo( &cl_videos[ i ] );
 }
 
 void CL_PurgeOwner( int owner )
 {
 	int i;
-	for( i = 0 ; i < cl_activevideos ; i++ )
-		if( videoarray[ i ].ownertag == owner )
-			CL_CloseVideo( &videoarray[ i ] );
+	for( i = 0 ; i < cl_num_videos ; i++ )
+		if( cl_videos[ i ].ownertag == owner )
+			CL_CloseVideo( &cl_videos[ i ] );
 }
 
 int cl_videoplaying = false; // old, but still supported
@@ -263,24 +285,35 @@ void CL_VideoStart(char *filename)
 {
 	Host_StartVideo();
 
-	if( videoarray->state != CLVIDEO_UNUSED )
-		CL_CloseVideo( videoarray );
-	if( !OpenVideo( videoarray, filename, va( CLVIDEOPREFIX "%s", filename ), 0 ) )
+	if( cl_videos->state != CLVIDEO_UNUSED )
+		CL_CloseVideo( cl_videos );
+	// already contains video/
+	if( !OpenVideo( cl_videos, filename, va( CLDYNTEXTUREPREFIX "%s", filename ), 0 ) )
 		return;
 	// expand the active range to include the new entry
-	cl_activevideos = max(cl_activevideos, 1);
+	cl_num_videos = max(cl_num_videos, 1);
 
 	cl_videoplaying = true;
 
-	CL_SetVideoState( videoarray, CLVIDEO_PLAY );
-	CL_RestartVideo( videoarray );
+	CL_SetVideoState( cl_videos, CLVIDEO_PLAY );
+	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;
 
-	CL_CloseVideo( videoarray );
+	CL_CloseVideo( cl_videos );
 }
 
 static void CL_PlayVideo_f(void)
@@ -295,7 +328,7 @@ static void CL_PlayVideo_f(void)
 		return;
 	}
 
-	sprintf(name, "video/%s.dpv", Cmd_Argv(1));
+	dpsnprintf(name, sizeof(name), "video/%s.dpv", Cmd_Argv(1));
 	CL_VideoStart(name);
 }
 
@@ -311,14 +344,14 @@ static void cl_video_start( void )
 
 	cl_videotexturepool = R_AllocTexturePool();
 
-	for( video = videoarray, i = 0 ; i < cl_activevideos ; i++, video++ )
+	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 )
 {
-	cl_activevideos = 0;
+	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" );