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/wav.c : In RDWR mode, pad the header if necessary (ie LIST chunk has moved or length has changed). Minor fixes in wav_write_strings.

Browse Source
This commit is contained in:
Erik de Castro Lopo 2008-08-18 08:49:30 +10:00
parent ee05bdf1b5
commit 431b789fbb
2 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -3,6 +3,11 @@
* tests/string_test.c
Polish string_multi_set_test.
* src/wav.c
In RDWR mode, pad the header if necessary (ie LIST chunk has moved or
length has changed).
Minor fixes in wav_write_strings.
2008-08-17 Erik de Castro Lopo <erikd AT mega-nerd DOT com>
* tests/string_test.c

16
src/wav.c
View File

@ -948,13 +948,21 @@ wav_write_header (SF_PRIVATE *psf, int calc_length)
} ;
} ;
if (psf->headindex + 8 < psf->dataoffset)
{ /* Add PAD data if necessary. */
k = psf->dataoffset - 16 - psf->headindex ;
psf_binheader_writef (psf, "em4z", PAD_MARKER, k, make_size_t (k)) ;
} ;
psf_binheader_writef (psf, "tm8", data_MARKER, psf->datalength) ;
psf_fwrite (psf->header, psf->headindex, 1, psf) ;
if (psf->error)
return psf->error ;
if (has_data && psf->dataoffset != psf->headindex)
{ psf_log_printf (psf, "Oooops : has_data && psf->dataoffset != psf->headindex\n") ;
return psf->error = SFE_INTERNAL ;
} ;
psf->dataoffset = psf->headindex ;
@ -1198,6 +1206,9 @@ static void
wav_write_strings (SF_PRIVATE *psf, int location)
{ int k, prev_head_index, saved_head_index ;
if (psf_location_string_count (psf, location) == 0)
return ;
prev_head_index = psf->headindex + 4 ;
psf_binheader_writef (psf, "m4m", LIST_MARKER, 0xBADBAD, INFO_MARKER) ;
@ -1205,7 +1216,7 @@ wav_write_strings (SF_PRIVATE *psf, int location)
for (k = 0 ; k < SF_MAX_STRINGS ; k++)
{ if (psf->strings [k].type == 0)
break ;
if (psf->strings [k].flags != location)
if (psf->strings [k].type < 0 || psf->strings [k].flags != location)
continue ;
switch (psf->strings [k].type)
@ -1232,6 +1243,9 @@ wav_write_strings (SF_PRIVATE *psf, int location)
case SF_STR_DATE :
psf_binheader_writef (psf, "ms", ICRD_MARKER, psf->strings [k].str) ;
break ;
default :
break ;
} ;
} ;