ref: b3977a7f05a18a701a3c17843fa1901ec2637c31
parent: 4ac0d391cbc8e14debb16b384b14ff432b87f92d
author: robs <robs>
date: Wed Nov 22 16:40:58 EST 2006
Added alias -1 (for -b), -2 (for -w), -4 (for -d).
--- a/Changelog
+++ b/Changelog
@@ -41,6 +41,7 @@
circumstances. (robs)
o Add support for 24-bit PCM raw, wav (WAVE_FORMAT_EXTENSIBLE) [FR# 801015],
& flac files. (robs)
+ o Added alias -1 (for -b), -2 (for -w), -4 (for -d). (robs)
sox-12.18.2
-----------
--- a/TODO
+++ b/TODO
@@ -59,11 +59,10 @@
o Document how the synth effect is meant to be used (with nul file
handler).
- o Implement FLAC (http://flac.sf.net) and speex (http://www.speex.org).
+ o Implement speex (http://www.speex.org).
- o Support 24-bit formats... Difficult because sometimes that means
- 24-bits in a 32-bit integer and sometimes it means packed 24-bits
- (read 3-bytes at a time).
+ o Support 24-bit formats where the 24-bits are stored in a 32-bit
+ integer.
o Modify .dat handler to support stereo data... Probably should remove
time offset column since its not real useful (could be added by
@@ -86,8 +85,6 @@
machines endian). This would be useful for cdr.c
since some formats like to keep the data in little-endien
(CDDA?).
-
- o Add alias -1 (for -b), -2 (for -w), -4 (for -d).
o Add a fifo/buffer to audio drivers to prevent losing audio data.
Perhaps mpg123 could be used as an example.
--- a/sox.1
+++ b/sox.1
@@ -276,8 +276,11 @@
European countries and it's gaining popularity because of its
quality. It usually is CPU intensive to work with GSM audio data.
.TP 10
-\fB-b/-w/-3/-l/-d\fR
-The sample data size is in bytes, 16-bit words, 3-byte (24-bit) words, 32-bit long words,
+\fB-1/-2/-3/-4\fR
+The sample data size is 1, 2, 3, or 4 bytes.
+.TP 10
+\fB-b/-w/-l/-d\fR
+The sample data size is in bytes, 16-bit words, 32-bit long words,
or 64-bit double long (long long) words.
.SH FILE TYPES
.I SoX
--- a/src/sox.c
+++ b/src/sox.c
@@ -293,7 +293,7 @@
return(0);
}
-static char *getoptstr = "+r:v:t:c:C:phsuUAaigbw3lfdxVSqo";
+static char *getoptstr = "+r:v:t:c:C:phsuUAaig1b2w34lfdxVSqo";
static struct option long_options[] =
{@@ -401,16 +401,16 @@
}
break;
- case 'b':
+ case '1': case 'b':
fo->info.size = ST_SIZE_BYTE;
break;
- case 'w':
+ case '2': case 'w':
fo->info.size = ST_SIZE_WORD;
break;
case '3':
fo->info.size = ST_SIZE_24BIT;
break;
- case 'l':
+ case '4': case 'l':
fo->info.size = ST_SIZE_DWORD;
break;
case 'd':
@@ -1726,7 +1726,8 @@
"-x invert auto-detected endianess of data\n"
"-s/-u/-U/-A/ sample encoding. signed/unsigned/u-law/A-law\n"
" -a/-i/-g/-f ADPCM/IMA_ADPCM/GSM/floating point\n"
-"-b/-w/-3/-l/-d sample size. byte(8-bits)/word(16-bits)/3-byte(24-bits)/\n"
+"-1/-2/-3/-4 sample size in bytes\n"
+"-b/-w/-l/-d sample size. byte(8-bits)/word(16-bits)/\n"
" long(32-bits)/double long(64-bits)\n"
"\n");