actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

make sure the last frame of MP3s is decoded

Browse Source
This commit is contained in:
Glenn Maynard
2004-03-28 05:10:26 +00:00
parent 5a4fc56592
commit 896ce3f103
1 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/RageSoundReader_MP3.cpp
+12 -1
View File
@@ -332,12 +332,23 @@ int RageSoundReader_MP3::fill_buffer()
mad->inbuf_filepos += mad->Stream.next_frame - mad->inbuf; mad->inbuf_filepos += mad->Stream.next_frame - mad->inbuf;
} }
int rc = file.Read( mad->inbuf + inbytes, sizeof (mad->inbuf)-inbytes ); const bool bWasAtEOF = file.AtEOF();
int rc = file.Read( mad->inbuf + inbytes, sizeof(mad->inbuf)-inbytes-MAD_BUFFER_GUARD );
if( rc < 0 ) if( rc < 0 )
{ {
SetError( file.GetError() ); SetError( file.GetError() );
return -1; return -1;
} }
if ( file.AtEOF() && !bWasAtEOF )
{
/* We just reached EOF. Append MAD_BUFFER_GUARD bytes of NULs to the
* buffer, to ensure that the last frame is flushed. */
memset( mad->inbuf + inbytes + rc, 0, MAD_BUFFER_GUARD );
rc += MAD_BUFFER_GUARD;
}
if ( rc == 0 ) if ( rc == 0 )
return 0; return 0;