Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-11-24 14:20:19 +01:00
Code Issues Releases Wiki Activity

Upgrades libsndfile to 1.0.24.

Browse Source
This commit is contained in:
lllucius
2011-04-03 03:08:57 +00:00
parent dbf2cdf605
commit fa00dd005f
267 changed files with 13363 additions and 14998 deletions
Download Patch File Download Diff File Expand all files Collapse all files

358
lib-src/libsndfile/src/sndfile.c
View File

@@ -1,5 +1,5 @@
/*
** Copyright (C) 1999-2009 Erik de Castro Lopo <erikd@mega-nerd.com>
** Copyright (C) 1999-2011 Erik de Castro Lopo <erikd@mega-nerd.com>
**
** This program is free software; you can redistribute it and/or modify
** it under the terms of the GNU Lesser General Public License as published by
@@ -57,7 +57,7 @@ ErrorStruct SndfileErrors [] =
{
/* Public error values and their associated strings. */
{ SF_ERR_NO_ERROR , "No Error." },
{ SF_ERR_UNRECOGNISED_FORMAT , "File opened for read. Format not recognised." },
{ SF_ERR_UNRECOGNISED_FORMAT , "Format not recognised." },
{ SF_ERR_SYSTEM , "System error." /* Often replaced. */ },
{ SF_ERR_MALFORMED_FILE , "Supported file format but file is malformed." },
{ SF_ERR_UNSUPPORTED_ENCODING , "Supported file format but unsupported encoding." },
@@ -89,7 +89,10 @@ ErrorStruct SndfileErrors [] =
{ SFE_NO_EMBEDDED_RDWR , "Error : cannot open embedded file read/write." },
{ SFE_NO_PIPE_WRITE , "Error : this file format does not support pipe write." },
{ SFE_BAD_VIRTUAL_IO , "Error : bad pointer on SF_VIRTUAL_IO struct." },
{ SFE_BAD_BROADCAST_INFO_SIZE, "Error : badd SF_BROADCAST_INFO_SIZE." },
{ SFE_BAD_BROADCAST_INFO_SIZE
, "Error : bad size in SF_BROADCAST_INFO struct." },
{ SFE_BAD_BROADCAST_INFO_TOO_BIG
, "Error : SF_BROADCAST_INFO struct too large." },
{ SFE_INTERLEAVE_MODE , "Attempt to write to file with non-interleaved data." },
{ SFE_INTERLEAVE_SEEK , "Bad karma in seek during interleave read operation." },
@@ -108,11 +111,11 @@ ErrorStruct SndfileErrors [] =
{ SFE_SEEK_FAILED , "Error : parameters OK, but psf_seek() failed." },
{ SFE_BAD_OPEN_MODE , "Error : bad mode parameter for file open." },
{ SFE_OPEN_PIPE_RDWR , "Error : attempt toopen a pipe in read/write mode." },
{ SFE_OPEN_PIPE_RDWR , "Error : attempt to open a pipe in read/write mode." },
{ SFE_RDWR_POSITION , "Error on RDWR position (cryptic)." },
{ SFE_RDWR_BAD_HEADER , "Error : Cannot open file in read/write mode due to string data in header." },
{ SFE_CMD_HAS_DATA , "Error : Command fails because file already has audio data." },
{ SFE_STR_NO_SUPPORT , "Error : File type does not support string data." },
{ SFE_STR_NOT_WRITE , "Error : Trying to set a string when file is not in write mode." },
{ SFE_STR_MAX_DATA , "Error : Maximum string data storage reached." },
@@ -237,7 +240,7 @@ ErrorStruct SndfileErrors [] =
{ SFE_FLAC_INIT_DECODER , "Error : problem while initialization of the flac decoder." },
{ SFE_FLAC_LOST_SYNC , "Error : flac decoder lost sync." },
{ SFE_FLAC_BAD_SAMPLE_RATE, "Error : flac does not support this sample rate." },
{ SFE_FLAC_UNKOWN_ERROR , "Error : unkown error in flac decoder." },
{ SFE_FLAC_UNKOWN_ERROR , "Error : unknown error in flac decoder." },
{ SFE_WVE_NOT_WVE , "Error : not a WVE file." },
{ SFE_WVE_NO_PIPE , "Error : not able to operate on WVE files over a pipe." },
@@ -263,15 +266,14 @@ static int validate_psf (SF_PRIVATE *psf) ;
static void save_header_info (SF_PRIVATE *psf) ;
static void copy_filename (SF_PRIVATE *psf, const char *path) ;
static int psf_close (SF_PRIVATE *psf) ;
static SNDFILE * psf_open_file (SF_PRIVATE *psf, int mode, SF_INFO *sfinfo) ;
static int try_resource_fork (SF_PRIVATE * psf, int mode) ;
static int try_resource_fork (SF_PRIVATE * psf) ;
/*------------------------------------------------------------------------------
** Private (static) variables.
*/
static int sf_errno = 0 ;
int sf_errno = 0 ;
static char sf_logbuffer [SF_BUFFER_LEN] = { 0 } ;
static char sf_syserr [SF_SYSERR_LEN] = { 0 } ;
@@ -304,6 +306,9 @@ SNDFILE*
sf_open (const char *path, int mode, SF_INFO *sfinfo)
{ SF_PRIVATE *psf ;
/* Ultimate sanity check. */
SF_ASSERT (sizeof (sf_count_t) == 8) ;
if ((psf = calloc (1, sizeof (SF_PRIVATE))) == NULL)
{ sf_errno = SFE_MALLOC_FAILED ;
return NULL ;
@@ -316,12 +321,13 @@ sf_open (const char *path, int mode, SF_INFO *sfinfo)
copy_filename (psf, path) ;
psf->file.mode = mode ;
if (strcmp (path, "-") == 0)
psf_set_stdio (psf, mode) ;
psf->error = psf_set_stdio (psf) ;
else
psf_fopen (psf, path, mode) ;
psf->error = psf_fopen (psf) ;
return psf_open_file (psf, mode, sfinfo) ;
return psf_open_file (psf, sfinfo) ;
} /* sf_open */
SNDFILE*
@@ -339,15 +345,17 @@ sf_open_fd (int fd, int mode, SF_INFO *sfinfo, int close_desc)
} ;
psf_init_files (psf) ;
copy_filename (psf, "") ;
psf->file.mode = mode ;
psf_set_file (psf, fd) ;
psf->is_pipe = psf_is_pipe (psf) ;
psf->fileoffset = psf_ftell (psf) ;
if (! close_desc)
psf->do_not_close_descriptor = SF_TRUE ;
psf->file.do_not_close_descriptor = SF_TRUE ;
return psf_open_file (psf, mode, sfinfo) ;
return psf_open_file (psf, sfinfo) ;
} /* sf_open_fd */
SNDFILE*
@@ -357,19 +365,19 @@ sf_open_virtual (SF_VIRTUAL_IO *sfvirtual, int mode, SF_INFO *sfinfo, void *user
/* Make sure we have a valid set ot virtual pointers. */
if (sfvirtual->get_filelen == NULL || sfvirtual->seek == NULL || sfvirtual->tell == NULL)
{ sf_errno = SFE_BAD_VIRTUAL_IO ;
LSF_SNPRINTF (sf_logbuffer, sizeof (sf_logbuffer), "Bad vio_get_filelen / vio_seek / vio_tell in SF_VIRTUAL_IO struct.\n") ;
snprintf (sf_logbuffer, sizeof (sf_logbuffer), "Bad vio_get_filelen / vio_seek / vio_tell in SF_VIRTUAL_IO struct.\n") ;
return NULL ;
} ;
if ((mode == SFM_READ || mode == SFM_RDWR) && sfvirtual->read == NULL)
{ sf_errno = SFE_BAD_VIRTUAL_IO ;
LSF_SNPRINTF (sf_logbuffer, sizeof (sf_logbuffer), "Bad vio_read in SF_VIRTUAL_IO struct.\n") ;
snprintf (sf_logbuffer, sizeof (sf_logbuffer), "Bad vio_read in SF_VIRTUAL_IO struct.\n") ;
return NULL ;
} ;
if ((mode == SFM_WRITE || mode == SFM_RDWR) && sfvirtual->write == NULL)
{ sf_errno = SFE_BAD_VIRTUAL_IO ;
LSF_SNPRINTF (sf_logbuffer, sizeof (sf_logbuffer), "Bad vio_write in SF_VIRTUAL_IO struct.\n") ;
snprintf (sf_logbuffer, sizeof (sf_logbuffer), "Bad vio_write in SF_VIRTUAL_IO struct.\n") ;
return NULL ;
} ;
@@ -384,9 +392,9 @@ sf_open_virtual (SF_VIRTUAL_IO *sfvirtual, int mode, SF_INFO *sfinfo, void *user
psf->vio = *sfvirtual ;
psf->vio_user_data = user_data ;
psf->mode = mode ;
psf->file.mode = mode ;
return psf_open_file (psf, mode, sfinfo) ;
return psf_open_file (psf, sfinfo) ;
} /* sf_open_virtual */
int
@@ -517,7 +525,7 @@ sf_error_str (SNDFILE *sndfile, char *str, size_t maxlen)
errnum = psf->error ;
} ;
LSF_SNPRINTF (str, maxlen, "%s", sf_error_number (errnum)) ;
snprintf (str, maxlen, "%s", sf_error_number (errnum)) ;
return SFE_NO_ERROR ;
} /* sf_error_str */
@@ -537,7 +545,7 @@ sf_format_check (const SF_INFO *info)
** Return 0 on failure, 1 ons success.
*/
if (info->channels < 1 || info->channels > 256)
if (info->channels < 1 || info->channels > SF_MAX_CHANNELS)
return 0 ;
if (info->samplerate < 0)
@@ -639,16 +647,14 @@ sf_format_check (const SF_INFO *info)
break ;
case SF_FORMAT_SVX :
/* SVX currently does not support more than one channel for write.
** Read will allow more than one channel but only allow one here.
*/
if (info->channels != 1)
/* SVX only supports writing mono SVX files. */
if (info->channels > 1)
return 0 ;
/* Always big endian. */
if (endian == SF_ENDIAN_LITTLE || endian == SF_ENDIAN_CPU)
return 0 ;
if ((subformat == SF_FORMAT_PCM_S8 || subformat == SF_FORMAT_PCM_16) && info->channels == 1)
if (subformat == SF_FORMAT_PCM_S8 || subformat == SF_FORMAT_PCM_16)
return 1 ;
break ;
@@ -811,23 +817,37 @@ sf_format_check (const SF_INFO *info)
return 0 ;
} /* sf_format_check */
/*------------------------------------------------------------------------------
*/
const char *
sf_version_string (void)
{
#if ENABLE_EXPERIMENTAL_CODE
return PACKAGE_NAME "-" PACKAGE_VERSION "-exp" ;
#else
return PACKAGE_NAME "-" PACKAGE_VERSION ;
#endif
}
/*------------------------------------------------------------------------------
*/
int
sf_command (SNDFILE *sndfile, int command, void *data, int datasize)
{ SF_PRIVATE *psf = NULL ;
{ SF_PRIVATE *psf = (SF_PRIVATE *) sndfile ;
int old_value ;
/* This set of commands do not need the sndfile parameter. */
switch (command)
{ case SFC_GET_LIB_VERSION :
if (data == NULL)
return (psf->error = SFE_BAD_COMMAND_PARAM) ;
if (ENABLE_EXPERIMENTAL_CODE)
LSF_SNPRINTF (data, datasize, "%s-%s-exp", PACKAGE_NAME, PACKAGE_VERSION) ;
else
LSF_SNPRINTF (data, datasize, "%s-%s", PACKAGE_NAME, PACKAGE_VERSION) ;
{ if (psf)
psf->error = SFE_BAD_COMMAND_PARAM ;
return SFE_BAD_COMMAND_PARAM ;
} ;
snprintf (data, datasize, "%s", sf_version_string ()) ;
return strlen (data) ;
case SFC_GET_SIMPLE_FORMAT_COUNT :
@@ -871,8 +891,8 @@ sf_command (SNDFILE *sndfile, int command, void *data, int datasize)
if (sndfile == NULL && command == SFC_GET_LOG_INFO)
{ if (data == NULL)
return (psf->error = SFE_BAD_COMMAND_PARAM) ;
LSF_SNPRINTF (data, datasize, "%s", sf_logbuffer) ;
return (sf_errno = SFE_BAD_COMMAND_PARAM) ;
snprintf (data, datasize, "%s", sf_logbuffer) ;
return strlen (data) ;
} ;
@@ -918,8 +938,16 @@ sf_command (SNDFILE *sndfile, int command, void *data, int datasize)
{ int format = SF_CONTAINER (psf->sf.format) ;
/* Only WAV and AIFF support the PEAK chunk. */
if (format != SF_FORMAT_WAV && format != SF_FORMAT_WAVEX && format != SF_FORMAT_AIFF)
return SF_FALSE ;
switch (format)
{ case SF_FORMAT_AIFF :
case SF_FORMAT_CAF :
case SF_FORMAT_WAV :
case SF_FORMAT_WAVEX :
break ;
default :
return SF_FALSE ;
} ;
format = SF_CODEC (psf->sf.format) ;
@@ -929,7 +957,7 @@ sf_command (SNDFILE *sndfile, int command, void *data, int datasize)
} ;
/* Can only do this is in SFM_WRITE mode. */
if (psf->mode != SFM_WRITE && psf->mode != SFM_RDWR)
if (psf->file.mode != SFM_WRITE && psf->file.mode != SFM_RDWR)
return SF_FALSE ;
/* If data has already been written this must fail. */
if (psf->have_written)
@@ -957,7 +985,7 @@ sf_command (SNDFILE *sndfile, int command, void *data, int datasize)
case SFC_GET_LOG_INFO :
if (data == NULL)
return SFE_BAD_COMMAND_PARAM ;
LSF_SNPRINTF (data, datasize, "%s", psf->logbuffer) ;
snprintf (data, datasize, "%s", psf->logbuffer) ;
break ;
case SFC_CALC_SIGNAL_MAX :
@@ -1019,7 +1047,7 @@ sf_command (SNDFILE *sndfile, int command, void *data, int datasize)
if (data == NULL || datasize != SIGNED_SIZEOF (SF_DITHER_INFO))
return (psf->error = SFE_BAD_COMMAND_PARAM) ;
memcpy (&psf->write_dither, data, sizeof (psf->write_dither)) ;
if (psf->mode == SFM_WRITE || psf->mode == SFM_RDWR)
if (psf->file.mode == SFM_WRITE || psf->file.mode == SFM_RDWR)
dither_init (psf, SFM_WRITE) ;
break ;
@@ -1027,15 +1055,20 @@ sf_command (SNDFILE *sndfile, int command, void *data, int datasize)
if (data == NULL || datasize != SIGNED_SIZEOF (SF_DITHER_INFO))
return (psf->error = SFE_BAD_COMMAND_PARAM) ;
memcpy (&psf->read_dither, data, sizeof (psf->read_dither)) ;
if (psf->mode == SFM_READ || psf->mode == SFM_RDWR)
if (psf->file.mode == SFM_READ || psf->file.mode == SFM_RDWR)
dither_init (psf, SFM_READ) ;
break ;
case SFC_FILE_TRUNCATE :
if (psf->mode != SFM_WRITE && psf->mode != SFM_RDWR)
if (psf->file.mode != SFM_WRITE && psf->file.mode != SFM_RDWR)
return SF_TRUE ;
if (datasize != sizeof (sf_count_t))
return SF_TRUE ;
if (data == NULL || datasize != sizeof (sf_count_t))
{ psf->error = SFE_BAD_COMMAND_PARAM ;
return SF_FALSE ;
}
else
{ sf_count_t position ;
position = *((sf_count_t*) data) ;
@@ -1102,16 +1135,16 @@ sf_command (SNDFILE *sndfile, int command, void *data, int datasize)
case SFC_SET_BROADCAST_INFO :
{ int format = SF_CONTAINER (psf->sf.format) ;
/* Only WAV supports the BEXT (Broadcast) chunk. */
if (format != SF_FORMAT_WAV && format != SF_FORMAT_WAVEX)
/* Only WAV and RF64 supports the BEXT (Broadcast) chunk. */
if (format != SF_FORMAT_WAV && format != SF_FORMAT_WAVEX && format != SF_FORMAT_RF64)
return SF_FALSE ;
} ;
/* Only makes sense in SFM_WRITE or SFM_RDWR mode. */
if ((psf->mode != SFM_WRITE) && (psf->mode != SFM_RDWR))
if ((psf->file.mode != SFM_WRITE) && (psf->file.mode != SFM_RDWR))
return SF_FALSE ;
/* If data has already been written this must fail. */
if (psf->broadcast_var == NULL && psf->have_written)
if (psf->broadcast_16k == NULL && psf->have_written)
{ psf->error = SFE_CMD_HAS_DATA ;
return SF_FALSE ;
} ;
@@ -1174,6 +1207,54 @@ sf_command (SNDFILE *sndfile, int command, void *data, int datasize)
case SFC_RAW_DATA_NEEDS_ENDSWAP :
return psf->data_endswap ;
case SFC_GET_CHANNEL_MAP_INFO :
if (psf->channel_map == NULL)
return SF_FALSE ;
if (data == NULL || datasize != SIGNED_SIZEOF (psf->channel_map [0]) * psf->sf.channels)
{ psf->error = SFE_BAD_COMMAND_PARAM ;
return SF_FALSE ;
} ;
memcpy (data, psf->channel_map, datasize) ;
return SF_TRUE ;
case SFC_SET_CHANNEL_MAP_INFO :
if (psf->have_written)
{ psf->error = SFE_CMD_HAS_DATA ;
return SF_FALSE ;
} ;
if (data == NULL || datasize != SIGNED_SIZEOF (psf->channel_map [0]) * psf->sf.channels)
{ psf->error = SFE_BAD_COMMAND_PARAM ;
return SF_FALSE ;
} ;
{ int *iptr ;
for (iptr = data ; iptr < (int*) data + psf->sf.channels ; iptr++)
{ if (*iptr <= SF_CHANNEL_MAP_INVALID || *iptr >= SF_CHANNEL_MAP_MAX)
{ psf->error = SFE_BAD_COMMAND_PARAM ;
return SF_FALSE ;
} ;
} ;
} ;
free (psf->channel_map) ;
if ((psf->channel_map = malloc (datasize)) == NULL)
{ psf->error = SFE_MALLOC_FAILED ;
return SF_FALSE ;
} ;
memcpy (psf->channel_map, data, datasize) ;
/*
** Pass the command down to the container's command handler.
** Don't pass user data, use validated psf->channel_map data instead.
*/
if (psf->command)
return psf->command (psf, command, NULL, 0) ;
return SF_FALSE ;
default :
/* Must be a file specific command. Pass it on. */
if (psf->command)
@@ -1204,8 +1285,8 @@ sf_seek (SNDFILE *sndfile, sf_count_t offset, int whence)
/* If the whence parameter has a mode ORed in, check to see that
** it makes sense.
*/
if (((whence & SFM_MASK) == SFM_WRITE && psf->mode == SFM_READ) ||
((whence & SFM_MASK) == SFM_READ && psf->mode == SFM_WRITE))
if (((whence & SFM_MASK) == SFM_WRITE && psf->file.mode == SFM_READ) ||
((whence & SFM_MASK) == SFM_READ && psf->file.mode == SFM_WRITE))
{ psf->error = SFE_WRONG_SEEK ;
return PSF_SEEK_ERROR ;
} ;
@@ -1225,14 +1306,14 @@ sf_seek (SNDFILE *sndfile, sf_count_t offset, int whence)
/* The SEEK_CUR is a little more tricky. */
case SEEK_CUR :
if (offset == 0)
{ if (psf->mode == SFM_READ)
{ if (psf->file.mode == SFM_READ)
return psf->read_current ;
if (psf->mode == SFM_WRITE)
if (psf->file.mode == SFM_WRITE)
return psf->write_current ;
} ;
if (psf->mode == SFM_READ)
if (psf->file.mode == SFM_READ)
seek_from_start = psf->read_current + offset ;
else if (psf->mode == SFM_WRITE || psf->mode == SFM_RDWR)
else if (psf->file.mode == SFM_WRITE || psf->file.mode == SFM_RDWR)
seek_from_start = psf->write_current + offset ;
else
psf->error = SFE_AMBIGUOUS_SEEK ;
@@ -1265,7 +1346,7 @@ sf_seek (SNDFILE *sndfile, sf_count_t offset, int whence)
if (psf->error)
return PSF_SEEK_ERROR ;
if (psf->mode == SFM_RDWR || psf->mode == SFM_WRITE)
if (psf->file.mode == SFM_RDWR || psf->file.mode == SFM_WRITE)
{ if (seek_from_start < 0)
{ psf->error = SFE_BAD_SEEK ;
return PSF_SEEK_ERROR ;
@@ -1277,7 +1358,7 @@ sf_seek (SNDFILE *sndfile, sf_count_t offset, int whence)
} ;
if (psf->seek)
{ int new_mode = (whence & SFM_MASK) ? (whence & SFM_MASK) : psf->mode ;
{ int new_mode = (whence & SFM_MASK) ? (whence & SFM_MASK) : psf->file.mode ;
retval = psf->seek (psf, new_mode, seek_from_start) ;
@@ -1342,12 +1423,12 @@ sf_read_raw (SNDFILE *sndfile, void *ptr, sf_count_t bytes)
bytewidth = (psf->bytewidth > 0) ? psf->bytewidth : 1 ;
blockwidth = (psf->blockwidth > 0) ? psf->blockwidth : 1 ;
if (psf->mode == SFM_WRITE)
if (psf->file.mode == SFM_WRITE)
{ psf->error = SFE_NOT_READMODE ;
return 0 ;
} ;
if (bytes < 0 || psf->read_current >= psf->datalength)
if (bytes < 0 || psf->read_current >= psf->sf.frames)
{ psf_memset (ptr, 0, bytes) ;
return 0 ;
} ;
@@ -1357,6 +1438,10 @@ sf_read_raw (SNDFILE *sndfile, void *ptr, sf_count_t bytes)
return 0 ;
} ;
if (psf->last_op != SFM_READ)
if (psf->seek (psf, SFM_READ, psf->read_current) < 0)
return 0 ;
count = psf_fread (ptr, 1, bytes, psf) ;
if (psf->read_current + count / blockwidth <= psf->sf.frames)
@@ -1383,7 +1468,7 @@ sf_read_short (SNDFILE *sndfile, short *ptr, sf_count_t len)
VALIDATE_SNDFILE_AND_ASSIGN_PSF (sndfile, psf, 1) ;
if (psf->mode == SFM_WRITE)
if (psf->file.mode == SFM_WRITE)
{ psf->error = SFE_NOT_READMODE ;
return 0 ;
} ;
@@ -1430,7 +1515,7 @@ sf_readf_short (SNDFILE *sndfile, short *ptr, sf_count_t frames)
VALIDATE_SNDFILE_AND_ASSIGN_PSF (sndfile, psf, 1) ;
if (psf->mode == SFM_WRITE)
if (psf->file.mode == SFM_WRITE)
{ psf->error = SFE_NOT_READMODE ;
return 0 ;
} ;
@@ -1475,7 +1560,7 @@ sf_read_int (SNDFILE *sndfile, int *ptr, sf_count_t len)
VALIDATE_SNDFILE_AND_ASSIGN_PSF (sndfile, psf, 1) ;
if (psf->mode == SFM_WRITE)
if (psf->file.mode == SFM_WRITE)
{ psf->error = SFE_NOT_READMODE ;
return 0 ;
} ;
@@ -1522,7 +1607,7 @@ sf_readf_int (SNDFILE *sndfile, int *ptr, sf_count_t frames)
VALIDATE_SNDFILE_AND_ASSIGN_PSF (sndfile, psf, 1) ;
if (psf->mode == SFM_WRITE)
if (psf->file.mode == SFM_WRITE)
{ psf->error = SFE_NOT_READMODE ;
return 0 ;
} ;
@@ -1567,7 +1652,7 @@ sf_read_float (SNDFILE *sndfile, float *ptr, sf_count_t len)
VALIDATE_SNDFILE_AND_ASSIGN_PSF (sndfile, psf, 1) ;
if (psf->mode == SFM_WRITE)
if (psf->file.mode == SFM_WRITE)
{ psf->error = SFE_NOT_READMODE ;
return 0 ;
} ;
@@ -1614,7 +1699,7 @@ sf_readf_float (SNDFILE *sndfile, float *ptr, sf_count_t frames)
VALIDATE_SNDFILE_AND_ASSIGN_PSF (sndfile, psf, 1) ;
if (psf->mode == SFM_WRITE)
if (psf->file.mode == SFM_WRITE)
{ psf->error = SFE_NOT_READMODE ;
return 0 ;
} ;
@@ -1659,7 +1744,7 @@ sf_read_double (SNDFILE *sndfile, double *ptr, sf_count_t len)
VALIDATE_SNDFILE_AND_ASSIGN_PSF (sndfile, psf, 1) ;
if (psf->mode == SFM_WRITE)
if (psf->file.mode == SFM_WRITE)
{ psf->error = SFE_NOT_READMODE ;
return 0 ;
} ;
@@ -1706,7 +1791,7 @@ sf_readf_double (SNDFILE *sndfile, double *ptr, sf_count_t frames)
VALIDATE_SNDFILE_AND_ASSIGN_PSF (sndfile, psf, 1) ;
if (psf->mode == SFM_WRITE)
if (psf->file.mode == SFM_WRITE)
{ psf->error = SFE_NOT_READMODE ;
return 0 ;
} ;
@@ -1755,7 +1840,7 @@ sf_write_raw (SNDFILE *sndfile, const void *ptr, sf_count_t len)
bytewidth = (psf->bytewidth > 0) ? psf->bytewidth : 1 ;
blockwidth = (psf->blockwidth > 0) ? psf->blockwidth : 1 ;
if (psf->mode == SFM_READ)
if (psf->file.mode == SFM_READ)
{ psf->error = SFE_NOT_WRITEMODE ;
return 0 ;
} ;
@@ -1765,6 +1850,10 @@ sf_write_raw (SNDFILE *sndfile, const void *ptr, sf_count_t len)
return 0 ;
} ;
if (psf->last_op != SFM_WRITE)
if (psf->seek (psf, SFM_WRITE, psf->write_current) < 0)
return 0 ;
if (psf->have_written == SF_FALSE && psf->write_header != NULL)
psf->write_header (psf, SF_FALSE) ;
psf->have_written = SF_TRUE ;
@@ -1773,11 +1862,14 @@ sf_write_raw (SNDFILE *sndfile, const void *ptr, sf_count_t len)
psf->write_current += count / blockwidth ;
psf->last_op = SFM_WRITE ;
if (psf->auto_header && psf->write_header != NULL)
psf->write_header (psf, SF_TRUE) ;
if (psf->write_current > psf->sf.frames)
psf->sf.frames = psf->write_current ;
psf->last_op = SFM_WRITE ;
return count ;
} /* sf_write_raw */
@@ -1791,7 +1883,7 @@ sf_write_short (SNDFILE *sndfile, const short *ptr, sf_count_t len)
VALIDATE_SNDFILE_AND_ASSIGN_PSF (sndfile, psf, 1) ;
if (psf->mode == SFM_READ)
if (psf->file.mode == SFM_READ)
{ psf->error = SFE_NOT_WRITEMODE ;
return 0 ;
} ;
@@ -1836,7 +1928,7 @@ sf_writef_short (SNDFILE *sndfile, const short *ptr, sf_count_t frames)
VALIDATE_SNDFILE_AND_ASSIGN_PSF (sndfile, psf, 1) ;
if (psf->mode == SFM_READ)
if (psf->file.mode == SFM_READ)
{ psf->error = SFE_NOT_WRITEMODE ;
return 0 ;
} ;
@@ -1879,7 +1971,7 @@ sf_write_int (SNDFILE *sndfile, const int *ptr, sf_count_t len)
VALIDATE_SNDFILE_AND_ASSIGN_PSF (sndfile, psf, 1) ;
if (psf->mode == SFM_READ)
if (psf->file.mode == SFM_READ)
{ psf->error = SFE_NOT_WRITEMODE ;
return 0 ;
} ;
@@ -1924,7 +2016,7 @@ sf_writef_int (SNDFILE *sndfile, const int *ptr, sf_count_t frames)
VALIDATE_SNDFILE_AND_ASSIGN_PSF (sndfile, psf, 1) ;
if (psf->mode == SFM_READ)
if (psf->file.mode == SFM_READ)
{ psf->error = SFE_NOT_WRITEMODE ;
return 0 ;
} ;
@@ -1967,7 +2059,7 @@ sf_write_float (SNDFILE *sndfile, const float *ptr, sf_count_t len)
VALIDATE_SNDFILE_AND_ASSIGN_PSF (sndfile, psf, 1) ;
if (psf->mode == SFM_READ)
if (psf->file.mode == SFM_READ)
{ psf->error = SFE_NOT_WRITEMODE ;
return 0 ;
} ;
@@ -2012,7 +2104,7 @@ sf_writef_float (SNDFILE *sndfile, const float *ptr, sf_count_t frames)
VALIDATE_SNDFILE_AND_ASSIGN_PSF (sndfile, psf, 1) ;
if (psf->mode == SFM_READ)
if (psf->file.mode == SFM_READ)
{ psf->error = SFE_NOT_WRITEMODE ;
return 0 ;
} ;
@@ -2055,7 +2147,7 @@ sf_write_double (SNDFILE *sndfile, const double *ptr, sf_count_t len)
VALIDATE_SNDFILE_AND_ASSIGN_PSF (sndfile, psf, 1) ;
if (psf->mode == SFM_READ)
if (psf->file.mode == SFM_READ)
{ psf->error = SFE_NOT_WRITEMODE ;
return 0 ;
} ;
@@ -2100,7 +2192,7 @@ sf_writef_double (SNDFILE *sndfile, const double *ptr, sf_count_t frames)
VALIDATE_SNDFILE_AND_ASSIGN_PSF (sndfile, psf, 1) ;
if (psf->mode == SFM_READ)
if (psf->file.mode == SFM_READ)
{ psf->error = SFE_NOT_WRITEMODE ;
return 0 ;
} ;
@@ -2138,13 +2230,18 @@ sf_writef_double (SNDFILE *sndfile, const double *ptr, sf_count_t frames)
*/
static int
try_resource_fork (SF_PRIVATE * psf, int mode)
{
if (psf_open_rsrc (psf, mode) != 0)
try_resource_fork (SF_PRIVATE * psf)
{ int old_error = psf->error ;
/* Set READ mode now, to see if resource fork exists. */
psf->rsrc.mode = SFM_READ ;
if (psf_open_rsrc (psf) != 0)
{ psf->error = old_error ;
return 0 ;
} ;
/* More checking here. */
psf_log_printf (psf, "Resource fork : %s\n", psf->rsrcpath) ;
psf_log_printf (psf, "Resource fork : %s\n", psf->rsrc.path.c) ;
return SF_FORMAT_SD2 ;
} /* try_resource_fork */
@@ -2155,17 +2252,14 @@ format_from_extension (SF_PRIVATE *psf)
char buffer [16] ;
int format = 0 ;
if (psf->filename == NULL)
return 0 ;
if ((cptr = strrchr (psf->filename, '.')) == NULL)
if ((cptr = strrchr (psf->file.name.c, '.')) == NULL)
return 0 ;
cptr ++ ;
if (strlen (cptr) > sizeof (buffer) - 1)
return 0 ;
strncpy (buffer, cptr, sizeof (buffer)) ;
psf_strlcpy (buffer, sizeof (buffer), cptr) ;
buffer [sizeof (buffer) - 1] = 0 ;
/* Convert everything in the buffer to lower case. */
@@ -2305,24 +2399,32 @@ guess_file_type (SF_PRIVATE *psf)
if (buffer [0] == MAKE_MARKER ('f', 'L', 'a', 'C'))
return SF_FORMAT_FLAC ;
/* Turtle Beach SMP 16-bit */
if (buffer [0] == MAKE_MARKER ('S', 'O', 'U', 'N') && buffer [1] == MAKE_MARKER ('D', ' ', 'S', 'A'))
return 0 ;
if (buffer [0] == MAKE_MARKER ('S', 'Y', '8', '0') || buffer [0] == MAKE_MARKER ('S', 'Y', '8', '5'))
return 0 ;
if (buffer [0] == MAKE_MARKER ('a', 'j', 'k', 'g'))
return 0 /*-SF_FORMAT_SHN-*/ ;
if (buffer [0] == MAKE_MARKER ('2', 'B', 'I', 'T'))
return SF_FORMAT_AVR ;
if (buffer [0] == MAKE_MARKER ('R', 'F', '6', '4') && buffer [2] == MAKE_MARKER ('W', 'A', 'V', 'E'))
return SF_FORMAT_RF64 ;
/* This must be the second last one. */
if (psf->filelength > 0 && (format = try_resource_fork (psf, SFM_READ)) != 0)
if (buffer [0] == MAKE_MARKER ('I', 'D', '3', 3))
{ psf_log_printf (psf, "Found 'ID3' marker.\n") ;
if (id3_skip (psf))
return guess_file_type (psf) ;
return 0 ;
} ;
/* Turtle Beach SMP 16-bit */
if (buffer [0] == MAKE_MARKER ('S', 'O', 'U', 'N') && buffer [1] == MAKE_MARKER ('D', ' ', 'S', 'A'))
return 0 ;
/* Yamaha sampler format. */
if (buffer [0] == MAKE_MARKER ('S', 'Y', '8', '0') || buffer [0] == MAKE_MARKER ('S', 'Y', '8', '5'))
return 0 ;
if (buffer [0] == MAKE_MARKER ('a', 'j', 'k', 'g'))
return 0 /*-SF_FORMAT_SHN-*/ ;
/* This must be the last one. */
if (psf->filelength > 0 && (format = try_resource_fork (psf)) != 0)
return format ;
return 0 ;
@@ -2367,7 +2469,7 @@ validate_psf (SF_PRIVATE *psf)
static void
save_header_info (SF_PRIVATE *psf)
{ LSF_SNPRINTF (sf_logbuffer, sizeof (sf_logbuffer), "%s", psf->logbuffer) ;
{ snprintf (sf_logbuffer, sizeof (sf_logbuffer), "%s", psf->logbuffer) ;
} /* save_header_info */
static void
@@ -2375,20 +2477,20 @@ copy_filename (SF_PRIVATE *psf, const char *path)
{ const char *ccptr ;
char *cptr ;
LSF_SNPRINTF (psf->filepath, sizeof (psf->filepath), "%s", path) ;
snprintf (psf->file.path.c, sizeof (psf->file.path.c), "%s", path) ;
if ((ccptr = strrchr (path, '/')) || (ccptr = strrchr (path, '\\')))
ccptr ++ ;
else
ccptr = path ;
LSF_SNPRINTF (psf->filename, sizeof (psf->filename), "%s", ccptr) ;
snprintf (psf->file.name.c, sizeof (psf->file.name.c), "%s", ccptr) ;
/* Now grab the directory. */
LSF_SNPRINTF (psf->directory, sizeof (psf->directory), "%s", path) ;
if ((cptr = strrchr (psf->directory, '/')) || (cptr = strrchr (psf->directory, '\\')))
snprintf (psf->file.dir.c, sizeof (psf->file.dir.c), "%s", path) ;
if ((cptr = strrchr (psf->file.dir.c, '/')) || (cptr = strrchr (psf->file.dir.c, '\\')))
cptr [1] = 0 ;
else
psf->directory [0] = 0 ;
psf->file.dir.c [0] = 0 ;
return ;
} /* copy_filename */
@@ -2423,8 +2525,8 @@ psf_close (SF_PRIVATE *psf)
if (psf->peak_info)
free (psf->peak_info) ;
if (psf->broadcast_var)
free (psf->broadcast_var) ;
if (psf->broadcast_16k)
free (psf->broadcast_16k) ;
if (psf->loop_info)
free (psf->loop_info) ;
@@ -2446,8 +2548,8 @@ psf_close (SF_PRIVATE *psf)
return error ;
} /* psf_close */
static SNDFILE *
psf_open_file (SF_PRIVATE *psf, int mode, SF_INFO *sfinfo)
SNDFILE *
psf_open_file (SF_PRIVATE *psf, SF_INFO *sfinfo)
{ int error, format ;
sf_errno = error = 0 ;
@@ -2458,7 +2560,7 @@ psf_open_file (SF_PRIVATE *psf, int mode, SF_INFO *sfinfo)
goto error_exit ;
} ;
if (mode != SFM_READ && mode != SFM_WRITE && mode != SFM_RDWR)
if (psf->file.mode != SFM_READ && psf->file.mode != SFM_WRITE && psf->file.mode != SFM_RDWR)
{ error = SFE_BAD_OPEN_MODE ;
goto error_exit ;
} ;
@@ -2473,7 +2575,7 @@ psf_open_file (SF_PRIVATE *psf, int mode, SF_INFO *sfinfo)
sfinfo->sections = 0 ;
sfinfo->seekable = 0 ;
if (mode == SFM_READ)
if (psf->file.mode == SFM_READ)
{ if ((SF_CONTAINER (sfinfo->format)) == SF_FORMAT_RAW)
{ if (sf_format_check (sfinfo) == 0)
{ error = SFE_RAW_BAD_FORMAT ;
@@ -2489,7 +2591,6 @@ psf_open_file (SF_PRIVATE *psf, int mode, SF_INFO *sfinfo)
psf->Magick = SNDFILE_MAGICK ;
psf->norm_float = SF_TRUE ;
psf->norm_double = SF_TRUE ;
psf->mode = mode ;
psf->dataoffset = -1 ;
psf->datalength = -1 ;
psf->read_current = -1 ;
@@ -2519,7 +2620,7 @@ psf_open_file (SF_PRIVATE *psf, int mode, SF_INFO *sfinfo)
} ;
if (psf->fileoffset > 0)
{ switch (psf->mode)
{ switch (psf->file.mode)
{ case SFM_READ :
if (psf->filelength < 44)
{ psf_log_printf (psf, "Short filelength: %D (fileoffset: %D)\n", psf->filelength, psf->fileoffset) ;
@@ -2547,7 +2648,7 @@ psf_open_file (SF_PRIVATE *psf, int mode, SF_INFO *sfinfo)
else
psf_log_printf (psf, "Length : %D\n", psf->filelength) ;
if (mode == SFM_WRITE || (mode == SFM_RDWR && psf->filelength == 0))
if (psf->file.mode == SFM_WRITE || (psf->file.mode == SFM_RDWR && psf->filelength == 0))
{ /* If the file is being opened for write or RDWR and the file is currently
** empty, then the SF_INFO struct must contain valid data.
*/
@@ -2555,7 +2656,7 @@ psf_open_file (SF_PRIVATE *psf, int mode, SF_INFO *sfinfo)
{ error = SFE_ZERO_MAJOR_FORMAT ;
goto error_exit ;
} ;
if ((SF_CONTAINER (psf->sf.format)) == 0)
if ((SF_CODEC (psf->sf.format)) == 0)
{ error = SFE_ZERO_MINOR_FORMAT ;
goto error_exit ;
} ;
@@ -2574,7 +2675,7 @@ psf_open_file (SF_PRIVATE *psf, int mode, SF_INFO *sfinfo)
} ;
/* Prevent unnecessary seeks */
psf->last_op = psf->mode ;
psf->last_op = psf->file.mode ;
/* Set bytewidth if known. */
switch (SF_CODEC (psf->sf.format))
@@ -2728,18 +2829,29 @@ psf_open_file (SF_PRIVATE *psf, int mode, SF_INFO *sfinfo)
/* For now, check whether embedding is supported. */
format = SF_CONTAINER (psf->sf.format) ;
if (psf->fileoffset > 0 &&
(format != SF_FORMAT_WAV) && (format != SF_FORMAT_WAVEX) &&
(format != SF_FORMAT_AIFF) && (format != SF_FORMAT_AU)
)
{ error = SFE_NO_EMBED_SUPPORT ;
goto error_exit ;
if (psf->fileoffset > 0)
{ switch (format)
{ case SF_FORMAT_WAV :
case SF_FORMAT_WAVEX :
case SF_FORMAT_AIFF :
case SF_FORMAT_AU :
/* Actual embedded files. */
break ;
case SF_FORMAT_FLAC :
/* Flac with an ID3v2 header? */
break ;
default :
error = SFE_NO_EMBED_SUPPORT ;
goto error_exit ;
} ;
} ;
if (psf->fileoffset > 0)
psf_log_printf (psf, "Embedded file length : %D\n", psf->filelength) ;
if (mode == SFM_RDWR && sf_format_check (&(psf->sf)) == 0)
if (psf->file.mode == SFM_RDWR && sf_format_check (&(psf->sf)) == 0)
{ error = SFE_BAD_MODE_RW ;
goto error_exit ;
} ;
@@ -2759,7 +2871,7 @@ psf_open_file (SF_PRIVATE *psf, int mode, SF_INFO *sfinfo)
psf->read_current = 0 ;
psf->write_current = 0 ;
if (psf->mode == SFM_RDWR)
if (psf->file.mode == SFM_RDWR)
{ psf->write_current = psf->sf.frames ;
psf->have_written = psf->sf.frames > 0 ? SF_TRUE : SF_FALSE ;
} ;
@@ -2774,8 +2886,8 @@ error_exit :
sf_errno = error ;
if (error == SFE_SYSTEM)
LSF_SNPRINTF (sf_syserr, sizeof (sf_syserr), "%s", psf->syserr) ;
LSF_SNPRINTF (sf_logbuffer, sizeof (sf_logbuffer), "%s", psf->logbuffer) ;
snprintf (sf_syserr, sizeof (sf_syserr), "%s", psf->syserr) ;
snprintf (sf_logbuffer, sizeof (sf_logbuffer), "%s", psf->logbuffer) ;
switch (error)
{ case SF_ERR_SYSTEM :
@@ -2787,7 +2899,7 @@ error_exit :
break ;
default :
if (psf->mode == SFM_READ)
if (psf->file.mode == SFM_READ)
{ psf_log_printf (psf, "Parse error : %s\n", sf_error_number (error)) ;
error = SF_ERR_MALFORMED_FILE ;
} ;