Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-10-22 22:43:01 +02: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

91
lib-src/libsndfile/src/sds.c
View File

@@ -1,5 +1,5 @@
/*
** Copyright (C) 2002-2009 Erik de Castro Lopo <erikd@mega-nerd.com>
** Copyright (C) 2002-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
@@ -56,6 +56,7 @@ typedef struct tag_SDS_PRIVATE
int read_samples [SDS_BLOCK_SIZE / 2] ; /* Maximum samples per block */
int write_block, write_count ;
int total_written ;
unsigned char write_data [SDS_BLOCK_SIZE] ;
int write_samples [SDS_BLOCK_SIZE / 2] ; /* Maximum samples per block */
} SDS_PRIVATE ;
@@ -111,7 +112,7 @@ sds_open (SF_PRIVATE *psf)
return SFE_MALLOC_FAILED ;
psf->codec_data = psds ;
if (psf->mode == SFM_READ || (psf->mode == SFM_RDWR && psf->filelength > 0))
if (psf->file.mode == SFM_READ || (psf->file.mode == SFM_RDWR && psf->filelength > 0))
{ if ((error = sds_read_header (psf, psds)))
return error ;
} ;
@@ -119,7 +120,7 @@ sds_open (SF_PRIVATE *psf)
if ((SF_CONTAINER (psf->sf.format)) != SF_FORMAT_SDS)
return SFE_BAD_OPEN_FORMAT ;
if (psf->mode == SFM_WRITE || psf->mode == SFM_RDWR)
if (psf->file.mode == SFM_WRITE || psf->file.mode == SFM_RDWR)
{ if (sds_write_header (psf, SF_FALSE))
return psf->error ;
@@ -145,7 +146,7 @@ sds_open (SF_PRIVATE *psf)
static int
sds_close (SF_PRIVATE *psf)
{
if (psf->mode == SFM_WRITE || psf->mode == SFM_RDWR)
if (psf->file.mode == SFM_WRITE || psf->file.mode == SFM_RDWR)
{ SDS_PRIVATE *psds ;
if ((psds = (SDS_PRIVATE *) psf->codec_data) == NULL)
@@ -186,7 +187,7 @@ sds_init (SF_PRIVATE *psf, SDS_PRIVATE *psds)
psds->samplesperblock = SDS_AUDIO_BYTES_PER_BLOCK / 4 ;
} ;
if (psf->mode == SFM_READ || psf->mode == SFM_RDWR)
if (psf->file.mode == SFM_READ || psf->file.mode == SFM_RDWR)
{ psf->read_short = sds_read_s ;
psf->read_int = sds_read_i ;
psf->read_float = sds_read_f ;
@@ -196,7 +197,7 @@ sds_init (SF_PRIVATE *psf, SDS_PRIVATE *psds)
psds->reader (psf, psds) ;
} ;
if (psf->mode == SFM_WRITE || psf->mode == SFM_RDWR)
if (psf->file.mode == SFM_WRITE || psf->file.mode == SFM_RDWR)
{ psf->write_short = sds_write_s ;
psf->write_int = sds_write_i ;
psf->write_float = sds_write_f ;
@@ -219,26 +220,47 @@ sds_read_header (SF_PRIVATE *psf, SDS_PRIVATE *psds)
if (marker != 0xF07E || byte != 0x01)
return SFE_SDS_NOT_SDS ;
psf_log_printf (psf, "Midi Sample Dump Standard (.sds)\nF07E\n Midi Channel : %d\n", channel) ;
bytesread += psf_binheader_readf (psf, "e213", &sample_no, &bitwidth, &samp_period) ;
bytesread += psf_binheader_readf (psf, "e2", &sample_no) ;
sample_no = SDS_3BYTE_TO_INT_DECODE (sample_no) ;
psf_log_printf (psf, "Midi Sample Dump Standard (.sds)\nF07E\n"
" Midi Channel : %d\n Sample Number : %d\n",
channel, sample_no) ;
bytesread += psf_binheader_readf (psf, "e13", &bitwidth, &samp_period) ;
samp_period = SDS_3BYTE_TO_INT_DECODE (samp_period) ;
psds->bitwidth = bitwidth ;
psf->sf.samplerate = 1000000000 / samp_period ;
if (psds->bitwidth > 1)
psf_log_printf (psf, " Bit Width : %d\n", psds->bitwidth) ;
else
{ psf_log_printf (psf, " Bit Width : %d (should be > 1)\n", psds->bitwidth) ;
return SFE_SDS_BAD_BIT_WIDTH ;
} ;
psf_log_printf (psf, " Sample Number : %d\n"
" Bit Width : %d\n"
if (samp_period > 0)
{ psf->sf.samplerate = 1000000000 / samp_period ;
psf_log_printf (psf, " Sample Period : %d\n"
" Sample Rate : %d\n",
sample_no, psds->bitwidth, psf->sf.samplerate) ;
samp_period, psf->sf.samplerate) ;
}
else
{ psf->sf.samplerate = 16000 ;
psf_log_printf (psf, " Sample Period : %d (should be > 0)\n"
" Sample Rate : %d (guessed)\n",
samp_period, psf->sf.samplerate) ;
} ;
bytesread += psf_binheader_readf (psf, "e3331", &data_length, &sustain_loop_start, &sustain_loop_end, &loop_type) ;
data_length = SDS_3BYTE_TO_INT_DECODE (data_length) ;
psf->sf.frames = psds->frames = data_length ;
sustain_loop_start = SDS_3BYTE_TO_INT_DECODE (sustain_loop_start) ;
sustain_loop_end = SDS_3BYTE_TO_INT_DECODE (sustain_loop_end) ;
@@ -251,13 +273,6 @@ sds_read_header (SF_PRIVATE *psf, SDS_PRIVATE *psds)
psf->dataoffset = SDS_DATA_OFFSET ;
psf->datalength = psf->filelength - psf->dataoffset ;
if (data_length != psf->filelength - psf->dataoffset)
{ psf_log_printf (psf, " Datalength : %d (truncated data??? %d)\n", data_length, psf->filelength - psf->dataoffset) ;
data_length = psf->filelength - psf->dataoffset ;
}
else
psf_log_printf (psf, " Datalength : %d\n", data_length) ;
bytesread += psf_binheader_readf (psf, "1", &byte) ;
if (byte != 0xF7)
psf_log_printf (psf, "bad end : %X\n", byte & 0xFF) ;
@@ -281,9 +296,6 @@ sds_read_header (SF_PRIVATE *psf, SDS_PRIVATE *psds)
psf_log_printf (psf, "Frames : %d\n", blockcount * psds->samplesperblock) ;
psf->sf.frames = blockcount * psds->samplesperblock ;
psds->frames = blockcount * psds->samplesperblock ;
/* Always Mono */
psf->sf.channels = 1 ;
psf->sf.sections = 1 ;
@@ -337,7 +349,7 @@ sds_write_header (SF_PRIVATE *psf, int calc_length)
current = psf_ftell (psf) ;
if (calc_length)
psf->sf.frames = psds->total_blocks * psds->samplesperblock + psds->write_count ;
psf->sf.frames = psds->total_written ;
if (psds->write_count > 0)
{ int current_count = psds->write_count ;
@@ -378,9 +390,9 @@ sds_write_header (SF_PRIVATE *psf, int calc_length)
psf_binheader_writef (psf, "e213", 0, psds->bitwidth, samp_period) ;
data_length = SDS_INT_TO_3BYTE_ENCODE (psds->total_blocks * SDS_BLOCK_SIZE) ;
data_length = SDS_INT_TO_3BYTE_ENCODE (psds->total_written) ;
sustain_loop_start = SDS_INT_TO_3BYTE_ENCODE (0) ;
sustain_loop_end = SDS_INT_TO_3BYTE_ENCODE (psf->sf.frames) ;
sustain_loop_end = SDS_INT_TO_3BYTE_ENCODE (0) ;
psf_binheader_writef (psf, "e33311", data_length, sustain_loop_start, sustain_loop_end, loop_type, 0xF7) ;
@@ -429,7 +441,7 @@ sds_2byte_read (SF_PRIVATE *psf, SDS_PRIVATE *psds)
{ printf ("Error 1 : %02X\n", checksum & 0xFF) ;
}
for (k = 2 ; k < SDS_BLOCK_SIZE - 3 ; k ++)
for (k = 2 ; k <= SDS_BLOCK_SIZE - 3 ; k ++)
checksum ^= psds->read_data [k] ;
checksum &= 0x7F ;
@@ -473,7 +485,7 @@ sds_3byte_read (SF_PRIVATE *psf, SDS_PRIVATE *psds)
{ printf ("Error 1 : %02X\n", checksum & 0xFF) ;
}
for (k = 2 ; k < SDS_BLOCK_SIZE - 3 ; k ++)
for (k = 2 ; k <= SDS_BLOCK_SIZE - 3 ; k ++)
checksum ^= psds->read_data [k] ;
checksum &= 0x7F ;
@@ -517,7 +529,7 @@ sds_4byte_read (SF_PRIVATE *psf, SDS_PRIVATE *psds)
{ printf ("Error 1 : %02X\n", checksum & 0xFF) ;
}
for (k = 2 ; k < SDS_BLOCK_SIZE - 3 ; k ++)
for (k = 2 ; k <= SDS_BLOCK_SIZE - 3 ; k ++)
checksum ^= psds->read_data [k] ;
checksum &= 0x7F ;
@@ -749,7 +761,8 @@ sds_2byte_write (SF_PRIVATE *psf, SDS_PRIVATE *psds)
psds->write_data [0] = 0xF0 ;
psds->write_data [1] = 0x7E ;
psds->write_data [2] = 0 ; /* Channel number */
psds->write_data [3] = psds->write_block & 0x7F ; /* Packet number */
psds->write_data [3] = 2 ;
psds->write_data [4] = psds->write_block & 0x7F ; /* Packet number */
ucptr = psds->write_data + 5 ;
for (k = 0 ; k < 120 ; k += 2)
@@ -760,7 +773,7 @@ sds_2byte_write (SF_PRIVATE *psf, SDS_PRIVATE *psds)
} ;
checksum = psds->write_data [1] ;
for (k = 2 ; k < SDS_BLOCK_SIZE - 3 ; k ++)
for (k = 2 ; k <= SDS_BLOCK_SIZE - 3 ; k ++)
checksum ^= psds->write_data [k] ;
checksum &= 0x7F ;
@@ -789,7 +802,8 @@ sds_3byte_write (SF_PRIVATE *psf, SDS_PRIVATE *psds)
psds->write_data [0] = 0xF0 ;
psds->write_data [1] = 0x7E ;
psds->write_data [2] = 0 ; /* Channel number */
psds->write_data [3] = psds->write_block & 0x7F ; /* Packet number */
psds->write_data [3] = 2 ;
psds->write_data [4] = psds->write_block & 0x7F ; /* Packet number */
ucptr = psds->write_data + 5 ;
for (k = 0 ; k < 120 ; k += 3)
@@ -801,7 +815,7 @@ sds_3byte_write (SF_PRIVATE *psf, SDS_PRIVATE *psds)
} ;
checksum = psds->write_data [1] ;
for (k = 2 ; k < SDS_BLOCK_SIZE - 3 ; k ++)
for (k = 2 ; k <= SDS_BLOCK_SIZE - 3 ; k ++)
checksum ^= psds->write_data [k] ;
checksum &= 0x7F ;
@@ -830,7 +844,8 @@ sds_4byte_write (SF_PRIVATE *psf, SDS_PRIVATE *psds)
psds->write_data [0] = 0xF0 ;
psds->write_data [1] = 0x7E ;
psds->write_data [2] = 0 ; /* Channel number */
psds->write_data [3] = psds->write_block & 0x7F ; /* Packet number */
psds->write_data [3] = 2 ;
psds->write_data [4] = psds->write_block & 0x7F ; /* Packet number */
ucptr = psds->write_data + 5 ;
for (k = 0 ; k < 120 ; k += 4)
@@ -843,7 +858,7 @@ sds_4byte_write (SF_PRIVATE *psf, SDS_PRIVATE *psds)
} ;
checksum = psds->write_data [1] ;
for (k = 2 ; k < SDS_BLOCK_SIZE - 3 ; k ++)
for (k = 2 ; k <= SDS_BLOCK_SIZE - 3 ; k ++)
checksum ^= psds->write_data [k] ;
checksum &= 0x7F ;
@@ -873,6 +888,7 @@ sds_write_s (SF_PRIVATE *psf, const short *ptr, sf_count_t len)
if (psf->codec_data == NULL)
return 0 ;
psds = (SDS_PRIVATE*) psf->codec_data ;
psds->total_written += len ;
iptr = psf->u.ibuf ;
bufferlen = ARRAY_LEN (psf->u.ibuf) ;
@@ -896,6 +912,7 @@ sds_write_i (SF_PRIVATE *psf, const int *ptr, sf_count_t len)
if (psf->codec_data == NULL)
return 0 ;
psds = (SDS_PRIVATE*) psf->codec_data ;
psds->total_written += len ;
total = sds_write (psf, psds, ptr, len) ;
@@ -913,6 +930,7 @@ sds_write_f (SF_PRIVATE *psf, const float *ptr, sf_count_t len)
if (psf->codec_data == NULL)
return 0 ;
psds = (SDS_PRIVATE*) psf->codec_data ;
psds->total_written += len ;
if (psf->norm_float == SF_TRUE)
normfact = 1.0 * 0x80000000 ;
@@ -944,6 +962,7 @@ sds_write_d (SF_PRIVATE *psf, const double *ptr, sf_count_t len)
if (psf->codec_data == NULL)
return 0 ;
psds = (SDS_PRIVATE*) psf->codec_data ;
psds->total_written += len ;
if (psf->norm_double == SF_TRUE)
normfact = 1.0 * 0x80000000 ;