X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=cl_video.c;h=42c0496d679026ff9e5229329b32cd27bd6321cc;hb=e55cfe8fac4d7afea93eb01743650a4f9c51f478;hp=7707dd77e96fceca59c288eb0e79ae45297a917b;hpb=59d5ffaf49cffaec27871bfe53c9472d1f3d4259;p=xonotic%2Fdarkplaces.git diff --git a/cl_video.c b/cl_video.c index 7707dd77..42c0496d 100644 --- a/cl_video.c +++ b/cl_video.c @@ -9,16 +9,16 @@ static int cl_videobmask; static int cl_videogmask; static int cl_videobytesperpixel; -static clvideo_t videoarray[ MAXCLVIDEOS ]; -static mempool_t *cl_videomempool; +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; } @@ -44,8 +44,8 @@ static void SuspendVideo( clvideo_t * video ) // free the image data Mem_Free( video->imagedata ); // if we are in firstframe mode, also close the stream - if( video->state == CLVIDEO_FIRSTFRAME ) - dpvsimpledecode_close( video->stream ); + if( video->state == CLVIDEO_FIRSTFRAME ) + dpvsimpledecode_close( video->stream ); } static qboolean WakeVideo( clvideo_t * video ) @@ -59,10 +59,10 @@ static qboolean WakeVideo( clvideo_t * video ) video->state = CLVIDEO_UNUSED; return false; } - - video->imagedata = Mem_Alloc( cl_videomempool, 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 ); + video->cpif.tex = R_LoadTexture2D( cl_videotexturepool, video->cpif.name, + video->cpif.width, video->cpif.height, NULL, TEXTYPE_RGBA, TEXF_ALWAYSPRECACHE, NULL ); // update starttime video->starttime += realtime - video->lasttime; @@ -70,13 +70,13 @@ static qboolean WakeVideo( clvideo_t * video ) return true; } -static clvideo_t* OpenVideo( clvideo_t *video, char *filename, char *name, int owner ) +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,15 +88,15 @@ static clvideo_t* OpenVideo( clvideo_t *video, char *filename, char *name, int o 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->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( cl_videomempool, video->cpif.width * video->cpif.height * cl_videobytesperpixel ); + video->imagedata = Mem_Alloc( cls.permanentmempool, video->cpif.width * video->cpif.height * cl_videobytesperpixel ); return video; } -clvideo_t* CL_OpenVideo( char *filename, char *name, int owner ) +clvideo_t* CL_OpenVideo( const char *filename, const char *name, int owner ) { clvideo_t *video; @@ -105,33 +105,44 @@ clvideo_t* CL_OpenVideo( char *filename, char *name, int owner ) Con_Printf( "unable to open video \"%s\" - video limit reached\n", filename ); return NULL; } - return OpenVideo( video, filename, name, owner ); + video = OpenVideo( video, filename, name, owner ); + // expand the active range to include the new entry + if (video) + cl_num_videos = max(cl_num_videos, (int)(video - cl_videos) + 1); + return video; } -clvideo_t* CL_GetVideo( char *name ) +static clvideo_t* CL_GetVideoBySlot( int slot ) { - int i; - clvideo_t *video; - - for( i = 0 ; i < MAXCLVIDEOS ; i++ ) - if( videoarray[ i ].state != CLVIDEO_UNUSED - && !strcmp( videoarray[ i ].cpif.name , name ) ) - break; - if( i == MAXCLVIDEOS ) - return NULL; - video = &videoarray[ i ]; + clvideo_t *video = &cl_videos[ slot ]; if( video->suspended ) + { if( !WakeVideo( video ) ) return NULL; - else if( video->state == CLVIDEO_RESETONWAKEUP ) + else if( video->state == CLVIDEO_RESETONWAKEUP ) video->framenum = -1; + } video->lasttime = realtime; return video; } +clvideo_t *CL_GetVideoByName( const char *name ) +{ + int i; + + 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_num_videos ) + return CL_GetVideoBySlot( i ); + else + return NULL; +} + void CL_SetVideoState( clvideo_t *video, clvideostate_t state ) { if( !video ) @@ -147,7 +158,7 @@ void CL_RestartVideo( clvideo_t *video ) { if( !video ) return; - + video->starttime = video->lasttime = realtime; video->framenum = -1; @@ -178,15 +189,15 @@ 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 ) { do { video->framenum++; - if( dpvsimpledecode_video( video->stream, video->imagedata, cl_videormask, - cl_videogmask, cl_videobmask, cl_videobytesperpixel, - cl_videobytesperpixel * video->cpif.width ) + 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 ) @@ -194,8 +205,8 @@ static void VideoFrame( clvideo_t *video ) return; } } while( video->framenum < destframe ); - R_UpdateTexture( video->cpif.tex, video->imagedata ); - } + R_UpdateTexture( video->cpif.tex, (unsigned char *)video->imagedata, 0, 0, video->cpif.width, video->cpif.height ); + } } void CL_VideoFrame( void ) // update all videos @@ -203,35 +214,41 @@ void CL_VideoFrame( void ) // update all videos int i; clvideo_t *video; - for( video = videoarray, i = 0 ; i < MAXCLVIDEOS ; video++, i++ ) + if (!cl_num_videos) + return; + + 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 ) - video->starttime = realtime + video->framenum * video->framerate; - else + video->starttime = realtime - video->framenum * video->framerate; + else VideoFrame( video ); + } - if( videoarray->state == CLVIDEO_FIRSTFRAME ) + 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) + cl_num_videos--; } void CL_Video_Shutdown( void ) { int i; - for( i = 0 ; i < MAXCLVIDEOS ; i++ ) - CL_CloseVideo( &videoarray[ i ] ); - - R_FreeTexturePool( &cl_videotexturepool ); - Mem_FreePool( &cl_videomempool ); + for( i = 0 ; i < cl_num_videos ; i++ ) + CL_CloseVideo( &cl_videos[ i ] ); } void CL_PurgeOwner( int owner ) { int i; - for( i = 0 ; i < MAXCLVIDEOS ; 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 @@ -239,32 +256,48 @@ int cl_videoplaying = false; // old, but still supported void CL_DrawVideo(void) { if (cl_videoplaying) - DrawQ_Pic(0, 0, videoarray->cpif.name, vid.conwidth, vid.conheight, 1, 1, 1, 1, 0); + DrawQ_Pic(0, 0, &CL_GetVideoBySlot( 0 )->cpif, vid_conwidth.integer, vid_conheight.integer, 1, 1, 1, 1, 0); } void CL_VideoStart(char *filename) { - if( videoarray->state != CLVIDEO_UNUSED ) - CL_CloseVideo( videoarray ); - if( !OpenVideo( videoarray, filename, va( CLVIDEOPREFIX "%s", filename ), 0 ) ) + Host_StartVideo(); + + if( cl_videos->state != CLVIDEO_UNUSED ) + CL_CloseVideo( cl_videos ); + if( !OpenVideo( cl_videos, filename, va( CLVIDEOPREFIX "%s", filename ), 0 ) ) return; + // expand the active range to include the new entry + 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) { - char name[1024]; + char name[MAX_QPATH]; + + Host_StartVideo(); if (Cmd_Argc() != 2) { @@ -281,16 +314,39 @@ static void CL_StopVideo_f(void) CL_VideoStop(); } +static void cl_video_start( void ) +{ + int i; + clvideo_t *video; + + cl_videotexturepool = R_AllocTexturePool(); + + 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 ); +} + +static void cl_video_shutdown( void ) +{ + R_FreeTexturePool( &cl_videotexturepool ); +} + +static void cl_video_newmap( void ) +{ +} + void CL_Video_Init( void ) { + cl_num_videos = 0; cl_videobytesperpixel = 4; cl_videormask = BigLong(0xFF000000); cl_videogmask = BigLong(0x00FF0000); cl_videobmask = BigLong(0x0000FF00); - cl_videomempool = Mem_AllocPool( "CL_Video", 0, NULL ); - cl_videotexturepool = R_AllocTexturePool(); + 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( "playvideo", CL_PlayVideo_f ); - Cmd_AddCommand( "stopvideo", CL_StopVideo_f ); + R_RegisterModule( "CL_Video", cl_video_start, cl_video_shutdown, cl_video_newmap ); } +