ubergames/ioef
0
0
Fork 0
mirror of https://github.com/UberGames/ioef.git synced 2025-02-25 21:00:57 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix from the VirtualDub people which should make avi files created with the video command playable with numerous windows players.

Browse source
This commit is contained in:
Thilo Schulz 2006-07-31 13:05:15 +00:00
parent 3afbcc9854
commit 3a1c4aa457
2 changed files with 21 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
code/client/cl_avi.c
View file

@ -168,7 +168,7 @@ static ID_INLINE void END_CHUNK( void )
afd.chunkStackTop--; afd.chunkStackTop--;
bufIndex = afd.chunkStack[ afd.chunkStackTop ]; bufIndex = afd.chunkStack[ afd.chunkStackTop ];
bufIndex += 4; bufIndex += 4;
WRITE_4BYTES( endIndex - bufIndex - 1 ); WRITE_4BYTES( endIndex - bufIndex - 4 );
bufIndex = endIndex; bufIndex = endIndex;
bufIndex = PAD( bufIndex, 2 ); bufIndex = PAD( bufIndex, 2 );
} }
@ -223,7 +223,7 @@ void CL_WriteAVIHeader( void )
if( afd.motionJpeg ) if( afd.motionJpeg )
WRITE_STRING( "MJPG" ); WRITE_STRING( "MJPG" );
else else
WRITE_STRING( " BGR" ); WRITE_4BYTES( 0 ); // BI_RGB
WRITE_4BYTES( 0 ); //dwFlags WRITE_4BYTES( 0 ); //dwFlags
WRITE_4BYTES( 0 ); //dwPriority WRITE_4BYTES( 0 ); //dwPriority
@ -248,15 +248,18 @@ void CL_WriteAVIHeader( void )
WRITE_4BYTES( afd.width ); //biWidth WRITE_4BYTES( afd.width ); //biWidth
WRITE_4BYTES( afd.height ); //biHeight WRITE_4BYTES( afd.height ); //biHeight
WRITE_2BYTES( 1 ); //biPlanes WRITE_2BYTES( 1 ); //biPlanes
WRITE_2BYTES( 24 ); //biBitCount WRITE_2BYTES( 32 ); //biBitCount
if( afd.motionJpeg ) //biCompression if( afd.motionJpeg ) { //biCompression
WRITE_STRING( "MJPG" ); WRITE_STRING( "MJPG" );
else WRITE_4BYTES( afd.width *
WRITE_STRING( " BGR" );
WRITE_4BYTES( afd.width *
afd.height ); //biSizeImage afd.height ); //biSizeImage
} else {
WRITE_4BYTES( 0 ); // BI_RGB
WRITE_4BYTES( afd.width *
afd.height*4 ); //biSizeImage
}
WRITE_4BYTES( 0 ); //biXPelsPetMeter WRITE_4BYTES( 0 ); //biXPelsPetMeter
WRITE_4BYTES( 0 ); //biYPelsPetMeter WRITE_4BYTES( 0 ); //biYPelsPetMeter
WRITE_4BYTES( 0 ); //biClrUsed WRITE_4BYTES( 0 ); //biClrUsed
@ -485,7 +488,7 @@ void CL_WriteAVIVideoFrame( const byte *imageBuffer, int size )
// Index // Index
bufIndex = 0; bufIndex = 0;
WRITE_STRING( "00dc" ); //dwIdentifier WRITE_STRING( "00dc" ); //dwIdentifier
WRITE_4BYTES( 0 ); //dwFlags WRITE_4BYTES( 0x00000010 ); //dwFlags (all frames are KeyFrames)
WRITE_4BYTES( chunkOffset ); //dwOffset WRITE_4BYTES( chunkOffset ); //dwOffset
WRITE_4BYTES( size ); //dwLength WRITE_4BYTES( size ); //dwLength
SafeFS_Write( buffer, 16, afd.idxF ); SafeFS_Write( buffer, 16, afd.idxF );

17
code/renderer/tr_init.c
View file

@ -715,6 +715,7 @@ const void *RB_TakeVideoFrameCmd( const void *data )
const videoFrameCommand_t *cmd; const videoFrameCommand_t *cmd;
int frameSize; int frameSize;
int i; int i;
char swapper;
cmd = (const videoFrameCommand_t *)data; cmd = (const videoFrameCommand_t *)data;
@ -729,21 +730,21 @@ const void *RB_TakeVideoFrameCmd( const void *data )
{ {
frameSize = SaveJPGToBuffer( cmd->encodeBuffer, 95, frameSize = SaveJPGToBuffer( cmd->encodeBuffer, 95,
cmd->width, cmd->height, cmd->captureBuffer ); cmd->width, cmd->height, cmd->captureBuffer );
ri.CL_WriteAVIVideoFrame( cmd->encodeBuffer, frameSize );
} }
else else
{ {
frameSize = cmd->width * cmd->height * 4; frameSize = cmd->width * cmd->height * 4;
// Vertically flip the image for( i = 0; i < frameSize; i = i + 4) // Swap R and B
for( i = 0; i < cmd->height; i++ )
{ {
Com_Memcpy( &cmd->encodeBuffer[ i * ( cmd->width * 4 ) ], swapper = cmd->captureBuffer[ i ];
&cmd->captureBuffer[ ( cmd->height - i - 1 ) * ( cmd->width * 4 ) ], cmd->captureBuffer[ i ] = cmd->captureBuffer[ i + 2 ];
cmd->width * 4 ); cmd->captureBuffer[ i + 2 ] = swapper;
}
}
ri.CL_WriteAVIVideoFrame( cmd->encodeBuffer, frameSize ); }
ri.CL_WriteAVIVideoFrame( cmd->captureBuffer, frameSize );
}
return (const void *)(cmd + 1); return (const void *)(cmd + 1);
} }