vilyaem/Xrasher
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

engine: soundlib: snd_wav: attempt to fix misleading warning about truncated file

Browse source
This commit is contained in:
Alibek Omarov 2024-04-26 06:25:10 +03:00
parent 36a0c1fb17
commit 42dab2b1a5
1 changed files with 22 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
engine/common/soundlib/snd_wav.c
View file

@ -23,6 +23,11 @@ static const byte *iff_end;
static const byte *iff_lastChunk; static const byte *iff_lastChunk;
static int iff_chunkLen; static int iff_chunkLen;
static int IsFourCC( const byte *ptr, const byte *fourcc )
{
return 0 == memcmp( ptr, fourcc, 4 );
}
/* /*
================= =================
GetLittleShort GetLittleShort
@ -86,7 +91,21 @@ static void FindNextChunk( const char *filename, const char *name )
if( iff_chunkLen > remaining ) if( iff_chunkLen > remaining )
{ {
Con_DPrintf( "%s: '%s' truncated by %i bytes\n", __func__, filename, iff_chunkLen - remaining ); // only print this warning if selected chunk is truncated
//
// otherwise this warning becomes misleading because some
// idiot programs like CoolEdit (i.e. Adobe Audition) don't always
// respect pad byte. The file isn't actually truncated, it just
// can't be reliably parsed as a whole
if( IsFourCC( iff_lastChunk, "RIFF" )
|| IsFourCC( iff_lastChunk, "fmt " )
|| IsFourCC( iff_lastChunk, "cue " )
|| IsFourCC( iff_lastChunk, "LIST" )
|| IsFourCC( iff_lastChunk, "data" ))
{
Con_DPrintf( "%s: '%s' truncated by %i bytes\n", __func__, filename, iff_chunkLen - remaining );
}
iff_chunkLen = remaining; iff_chunkLen = remaining;
} }
@ -94,9 +113,9 @@ static void FindNextChunk( const char *filename, const char *name )
iff_dataPtr -= 8; iff_dataPtr -= 8;
iff_lastChunk = iff_dataPtr + 8 + iff_chunkLen; iff_lastChunk = iff_dataPtr + 8 + iff_chunkLen;
if ((iff_chunkLen&1) && remaining) if(( iff_chunkLen & 1 ) && remaining )
iff_lastChunk++; iff_lastChunk++;
if (!Q_strncmp(iff_dataPtr, name, 4)) if( IsFourCC( iff_dataPtr, name ))
return; return;
} }
} }