openharmony/third_party_libsnd
1
0
Fork 0
mirror of https://gitee.com/openharmony/third_party_libsnd synced 2024-11-23 09:59:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

src/rf64.c : Minor tweaks and additional sanity checking.

Browse Source
This commit is contained in:
Erik de Castro Lopo 2010-10-09 16:45:05 +11:00
parent 9286b2c335
commit 2fe4f99771
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -3,6 +3,9 @@
* tests/pedantic-header-test.sh.in
Handle unusual values of CC environment variable.
* src/rf64.c
Minor tweaks and additional sanity checking.
2010-10-08 Erik de Castro Lopo <erikd AT mega-nerd DOT com>
* src/sndfile.hh

9
src/rf64.c
View File

@ -157,7 +157,7 @@ static int
rf64_read_header (SF_PRIVATE *psf, int *blockalign, int *framesperblock)
{ WAV_PRIVATE *wpriv ;
WAV_FMT *wav_fmt ;
sf_count_t riff_size = 0, sample_count = 0 ;
sf_count_t riff_size = 0, frame_count = 0 ;
unsigned int size32, parsestage = 0 ;
int marker, marks [2], error, done = 0, format = 0 ;
@ -180,12 +180,12 @@ rf64_read_header (SF_PRIVATE *psf, int *blockalign, int *framesperblock)
psf_log_printf (psf, "%M : %u\n", marker, size32) ;
/* Read ds64 sizes (3 8-byte words). */
psf_binheader_readf (psf, "888", &riff_size, &psf->datalength, &sample_count) ;
psf_binheader_readf (psf, "888", &riff_size, &psf->datalength, &frame_count) ;
if (psf->filelength != riff_size + 8)
psf_log_printf (psf, " Riff size : %D (should be %D)\n Data size : %D\n", riff_size, psf->filelength - 8, psf->datalength) ;
else
psf_log_printf (psf, " Riff size : %D\n Data size : %D\n", riff_size, psf->datalength) ;
psf_log_printf (psf, " Frames : %D\n", sample_count) ;
psf_log_printf (psf, " Frames : %D\n", frame_count) ;
/* Read table length. */
psf_binheader_readf (psf, "4", &size32) ;
@ -307,6 +307,9 @@ rf64_read_header (SF_PRIVATE *psf, int *blockalign, int *framesperblock)
psf->sf.frames = psf->datalength / psf->blockwidth ;
} ;
if (frame_count != psf->sf.frames)
psf_log_printf (psf, "*** Calculated frame count %d does not match value from 'ds64' chunk %d\n", psf->sf.frames, frame_count) ;
switch (format)
{
case WAVE_FORMAT_EXTENSIBLE :