Another patch to make uncompressed AVI write in RGB24 format by anonymous virtualdub sympathiser.

git-svn-id: svn://svn.icculus.org/quake3/trunk@825 edf5b092-35ff-0310-97b2-ce42778d08ea

1 files changed, 7 insertions, 8 deletions

diff --git a/code/renderer/tr_init.c b/code/renderer/tr_init.c
index 87f47f1..347e7a7 100644
--- a/code/renderer/tr_init.c
+++ b/code/renderer/tr_init.c
@@ -715,7 +715,6 @@ const void *RB_TakeVideoFrameCmd( const void *data )
 	const videoFrameCommand_t	*cmd;
 	int												frameSize;
 	int												i;
-	char												swapper;
 	
 	cmd = (const videoFrameCommand_t *)data;
 	
@@ -734,16 +733,16 @@ const void *RB_TakeVideoFrameCmd( const void *data )
 	}
 	else
 	{
-		frameSize = cmd->width * cmd->height * 4;
+		frameSize = cmd->width * cmd->height;
 
-		for( i = 0; i < frameSize; i = i + 4)          // Swap R and B
+		for( i = 0; i < frameSize; i++)    // Pack to 24bpp and swap R and B
 		{
-			swapper = cmd->captureBuffer[ i ];
-			cmd->captureBuffer[ i ] = cmd->captureBuffer[ i + 2 ];
-			cmd->captureBuffer[ i + 2 ] = swapper;
-
+			cmd->encodeBuffer[ i*3 ]     = cmd->captureBuffer[ i*4 + 2 ];
+			cmd->encodeBuffer[ i*3 + 1 ] = cmd->captureBuffer[ i*4 + 1 ];
+			cmd->encodeBuffer[ i*3 + 2 ] = cmd->captureBuffer[ i*4 ];
 		}
-		ri.CL_WriteAVIVideoFrame( cmd->captureBuffer, frameSize );
+
+		ri.CL_WriteAVIVideoFrame( cmd->encodeBuffer, frameSize * 3 );
 	}
 
 	return (const void *)(cmd + 1);