aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortma <tma@edf5b092-35ff-0310-97b2-ce42778d08ea>2006-03-15 22:41:38 +0000
committertma <tma@edf5b092-35ff-0310-97b2-ce42778d08ea>2006-03-15 22:41:38 +0000
commit35a26dafe2dddb8daec1294f8dea4fa5fbecf83c (patch)
treebad5f75e0937d9c0fd1cd1dd27dfa37a23f2129f
parentd52cc607c6c85c8f33131c2f64a48a62e7426e1a (diff)
downloadioquake3-aero-35a26dafe2dddb8daec1294f8dea4fa5fbecf83c.tar.gz
ioquake3-aero-35a26dafe2dddb8daec1294f8dea4fa5fbecf83c.zip
* Video export doesn't crap out with sv_pure 1 anymore
* Video export doesn't crap out when writing > 2Gb files anymore git-svn-id: svn://svn.icculus.org/quake3/trunk@646 edf5b092-35ff-0310-97b2-ce42778d08ea
-rw-r--r--code/client/cl_avi.c48
1 files changed, 45 insertions, 3 deletions
diff --git a/code/client/cl_avi.c b/code/client/cl_avi.c
index 178260b..1806b4f 100644
--- a/code/client/cl_avi.c
+++ b/code/client/cl_avi.c
@@ -23,6 +23,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#include "client.h"
#include "snd_local.h"
+#define INDEX_FILE_EXTENSION ".index.dat"
+
#define MAX_RIFF_CHUNKS 16
typedef struct audioFormat_s
@@ -341,7 +343,8 @@ qboolean CL_OpenAVIForWriting( const char *fileName )
if( ( afd.f = FS_FOpenFileWrite( fileName ) ) <= 0 )
return qfalse;
- if( ( afd.idxF = FS_FOpenFileWrite( va( "%s.idx", fileName ) ) ) <= 0 )
+ if( ( afd.idxF = FS_FOpenFileWrite(
+ va( "%s" INDEX_FILE_EXTENSION, fileName ) ) ) <= 0 )
{
FS_FCloseFile( afd.f );
return qfalse;
@@ -416,6 +419,37 @@ qboolean CL_OpenAVIForWriting( const char *fileName )
/*
===============
+CL_CheckFileSize
+===============
+*/
+static qboolean CL_CheckFileSize( int bytesToAdd )
+{
+ unsigned int newFileSize;
+
+ newFileSize =
+ afd.fileSize + // Current file size
+ bytesToAdd + // What we want to add
+ ( afd.numIndices * 16 ) + // The index
+ 4; // The index size
+
+ // I assume all the operating systems
+ // we target can handle a 2Gb file
+ if( newFileSize > INT_MAX )
+ {
+ // Close the current file...
+ CL_CloseAVI( );
+
+ // ...And open a new one
+ CL_OpenAVIForWriting( va( "%s_", afd.fileName ) );
+
+ return qtrue;
+ }
+
+ return qfalse;
+}
+
+/*
+===============
CL_WriteAVIVideoFrame
===============
*/
@@ -429,6 +463,10 @@ void CL_WriteAVIVideoFrame( const byte *imageBuffer, int size )
if( !afd.fileOpen )
return;
+ // Chunk header + contents + padding
+ if( CL_CheckFileSize( 8 + size + 2 ) )
+ return;
+
bufIndex = 0;
WRITE_STRING( "00dc" );
WRITE_4BYTES( size );
@@ -473,6 +511,10 @@ void CL_WriteAVIAudioFrame( const byte *pcmBuffer, int size )
if( !afd.fileOpen )
return;
+ // Chunk header + contents + padding
+ if( CL_CheckFileSize( 8 + bytesInBuffer + size + 2 ) )
+ return;
+
if( bytesInBuffer + size > PCM_BUFFER_SIZE )
{
Com_Printf( S_COLOR_YELLOW
@@ -484,7 +526,7 @@ void CL_WriteAVIAudioFrame( const byte *pcmBuffer, int size )
bytesInBuffer += size;
// Only write if we have a frame's worth of audio
- if( bytesInBuffer >= (int)ceil( afd.a.rate / cl_aviFrameRate->value ) *
+ if( bytesInBuffer >= (int)ceil( (float)afd.a.rate / (float)afd.frameRate ) *
afd.a.sampleSize )
{
int chunkOffset = afd.fileSize - afd.moviOffset - 8;
@@ -545,7 +587,7 @@ qboolean CL_CloseAVI( void )
{
int indexRemainder;
int indexSize = afd.numIndices * 16;
- const char *idxFileName = va( "%s.idx", afd.fileName );
+ const char *idxFileName = va( "%s" INDEX_FILE_EXTENSION, afd.fileName );
// AVI file isn't open
if( !afd.fileOpen )