/* ulaw -> signed 16-bit */
-static short isdn_audio_ulaw_to_s16[] =
+static unsigned short isdn_audio_ulaw_to_s16[] =
{
0x8284, 0x8684, 0x8a84, 0x8e84, 0x9284, 0x9684, 0x9a84, 0x9e84,
0xa284, 0xa684, 0xaa84, 0xae84, 0xb284, 0xb684, 0xba84, 0xbe84,
};
/* alaw -> signed 16-bit */
-static short isdn_audio_alaw_to_s16[] =
+static unsigned short isdn_audio_alaw_to_s16[] =
{
0x13fc, 0xec04, 0x0144, 0xfebc, 0x517c, 0xae84, 0x051c, 0xfae4,
0x0a3c, 0xf5c4, 0x0048, 0xffb8, 0x287c, 0xd784, 0x028c, 0xfd74,
unsigned char encode_isdn(short sample, char law)
{
- int best=-1;
+ int best = -1;
int i,diff;
- int best_diff;
+ int best_diff = 9999;
i=0;
- while(i<256)
- {
- diff = (law=='u')?isdn_audio_ulaw_to_s16[i]:isdn_audio_alaw_to_s16[i]-sample;
+ while(i<256) {
+ diff = (law=='u')?((signed short)isdn_audio_ulaw_to_s16[i]):((signed short)isdn_audio_alaw_to_s16[i])-sample;
//printf("s16=%d sample%d diff=%d\n",isdn_audio_to_s16[i],sample,diff);
if (diff<0)
diff=0-diff;
//printf("diff=%d\n",diff);
- if (diff<best_diff || best<0)
- {
+ if (diff<best_diff || best<0) {
//printf("better %d\n",i);
best_diff=diff;
best=i;
int i;
i=0;
- while(i<length)
- {
+ while(i<length) {
if (i < fade_in)
fade=(double)i / (double)fade_in;
else fade=1.0;
struct fmt {
unsigned short stereo; /* 1 = pcm, 2 = adpcm */
unsigned short channels; /* number of channels */
- unsigned long sample_rate; /* sample rate */
- unsigned long data_rate; /* data rate */
+ unsigned int sample_rate; /* sample rate */
+ unsigned int data_rate; /* data rate */
unsigned short bytes_sample; /* bytes per sample (all channels) */
unsigned short bits_sample; /* bits per sample (one channel) */
};
unsigned char buffer[256];
struct fmt *fmt;
FILE *wfp;
- signed long i;
- int channels, bytes;
+ signed int i;
+ int channels = 0, bytes = 0;
short sample, sample2;
- signed long size, chunk;
+ signed int size, chunk;
int gotfmt = 0, gotdata = 0;
+ int __attribute__((__unused__)) ret;
- if ((wfp=fopen(wav,"r")))
- {
- fread(buffer,8,1,wfp);
+ if ((wfp=fopen(wav,"r"))) {
+ ret=fread(buffer,8,1,wfp);
size=(buffer[4]) + (buffer[5]<<8) + (buffer[6]<<16) + (buffer[7]<<24);
- if (!!strncmp((char *)buffer, "RIFF", 4))
- {
+ if (!!strncmp((char *)buffer, "RIFF", 4)) {
fclose(wfp);
fprintf(stderr, "Error: %s is no riff file!\n", wav);
return;
}
- printf("%c%c%c%c size=%ld\n",buffer[0],buffer[1],buffer[2],buffer[3],size);
- fread(buffer,4,1,wfp);
+ printf("%c%c%c%c size=%d\n",buffer[0],buffer[1],buffer[2],buffer[3],size);
+ ret=fread(buffer,4,1,wfp);
size -= 4;
- if (!!strncmp((char *)buffer, "WAVE", 4))
- {
+ if (!!strncmp((char *)buffer, "WAVE", 4)) {
fclose(wfp);
fprintf(stderr, "Error: %s is no wave file!\n", wav);
return;
}
- while(size > 0)
- {
- if (size>0 && size<8)
- {
+ while(size > 0) {
+ if (size>0 && size<8) {
fclose(wfp);
- fprintf(stderr, "Error: Remaining file size %ld not large enough for next chunk.\n",size);
+ fprintf(stderr, "Error: Remaining file size %d not large enough for next chunk.\n",size);
return;
}
- fread(buffer,8,1,wfp);
+ ret=fread(buffer,8,1,wfp);
chunk=(buffer[4]) + (buffer[5]<<8) + (buffer[6]<<16) + (buffer[7]<<24);
-//printf("DEBUG: size(%ld) - (8+chunk(%ld) = size(%ld)\n", size, chunk, size-chunk-8);
+//printf("DEBUG: size(%d) - (8+chunk(%d) = size(%d)\n", size, chunk, size-chunk-8);
size -= (8+chunk);
- if (size < 0)
- {
+ if (size < 0) {
fclose(wfp);
- fprintf(stderr, "Error: Chunk '%c%c%c%c' is larger than remainig file size (length=%ld)\n",buffer[0],buffer[1],buffer[2],buffer[3], chunk);
+ fprintf(stderr, "Error: Chunk '%c%c%c%c' is larger than remainig file size (length=%d)\n",buffer[0],buffer[1],buffer[2],buffer[3], chunk);
return;
}
// printf("%c%c%c%c lenght=%d\n",buffer[0],buffer[1],buffer[2],buffer[3],chunk);
- if (!strncmp((char *)buffer, "fmt ", 4))
- {
- if (chunk != 16)
- {
+ if (!strncmp((char *)buffer, "fmt ", 4)) {
+ if (chunk != 16) {
fclose(wfp);
fprintf(stderr, "Error: Fmt chunk illegal size.\n");
return;
}
- fread(buffer, chunk, 1, wfp);
+ ret=fread(buffer, chunk, 1, wfp);
fmt = (struct fmt *)buffer;
- if (fmt->channels<1 || fmt->channels>2)
- {
+ if (fmt->channels<1 || fmt->channels>2) {
fclose(wfp);
fprintf(stderr, "Error: Only support one or two channels file.\n");
return;
}
channels = fmt->channels;
printf("Channels: %d\n", channels);
- if (fmt->sample_rate != 8000)
- {
- fprintf(stderr, "Warning: File has sample rate of %ld.\n", fmt->sample_rate);
+ if (fmt->sample_rate != 8000) {
+ fprintf(stderr, "Warning: File has sample rate of %d.\n", fmt->sample_rate);
}
- printf("Sample Rate: %ld\n", fmt->sample_rate);
- if (fmt->bits_sample!=8 && fmt->bits_sample!=16)
- {
+ printf("Sample Rate: %d\n", fmt->sample_rate);
+ if (fmt->bits_sample!=8 && fmt->bits_sample!=16) {
fclose(wfp);
fprintf(stderr, "Error: File has neigher 8 nor 16 bit samples.\n");
return;
printf("Bit-Resolution: %d\n", bytes*16-16);
gotfmt = 1;
} else
- if (!strncmp((char *)buffer, "data", 4))
- {
- if (!gotfmt)
- {
+ if (!strncmp((char *)buffer, "data", 4)) {
+ if (!gotfmt) {
fclose(wfp);
fprintf(stderr, "Error: No fmt chunk fount in file.\n");
return;
}
- printf("Length: %ld samples (%ld.%03ld seconds)\n", chunk/bytes/channels, chunk/bytes/channels/8000, ((chunk/bytes/channels)%8000)*1000/8000);
+ printf("Length: %d samples (%d.%03d seconds)\n", chunk/bytes/channels, chunk/bytes/channels/8000, ((chunk/bytes/channels)%8000)*1000/8000);
i=0;
- if (bytes==2 && channels==1)
- {
- while(i<chunk)
- {
- fread(buffer, 2, 1, wfp);
+ if (bytes==2 && channels==1) {
+ while(i<chunk) {
+ ret=fread(buffer, 2, 1, wfp);
sample=(buffer[1]<<8) + (buffer[0]);
fputc(encode_isdn(sample, law),fp);
i+=2;
}
}
- if (bytes==2 && channels==2)
- {
- while(i<chunk)
- {
- fread(buffer, 4, 1, wfp);
+ if (bytes==2 && channels==2) {
+ while(i<chunk) {
+ ret=fread(buffer, 4, 1, wfp);
sample=(buffer[1]<<8) + (buffer[0]);
sample2=(buffer[3]<<8) + (buffer[2]);
sample = (sample/2) + (sample2/2);
i+=4;
}
}
- if (bytes==1 && channels==1)
- {
- while(i<chunk)
- {
- fread(buffer, 1, 1, wfp);
+ if (bytes==1 && channels==1) {
+ while(i<chunk) {
+ ret=fread(buffer, 1, 1, wfp);
sample=(buffer[0]<<8);
fputc(encode_isdn(sample, law),fp);
i+=1;
}
}
- if (bytes==1 && channels==2)
- {
- while(i<chunk)
- {
- fread(buffer, 2, 1, wfp);
+ if (bytes==1 && channels==2) {
+ while(i<chunk) {
+ ret=fread(buffer, 2, 1, wfp);
sample=(buffer[0]<<8);
sample2=(buffer[1]<<8);
sample = (sample/2) + (sample2/2);
}
}
gotdata = 1;
- } else
- {
- printf("Ignoring chunk '%c%c%c%c' (length=%ld)\n",buffer[0],buffer[1],buffer[2],buffer[3], chunk);
- while(chunk > (signed long)sizeof(buffer))
- {
- fread(buffer, sizeof(buffer), 1, wfp);
+ } else {
+ printf("Ignoring chunk '%c%c%c%c' (length=%d)\n",buffer[0],buffer[1],buffer[2],buffer[3], chunk);
+ while(chunk > (signed int)sizeof(buffer)) {
+ ret=fread(buffer, sizeof(buffer), 1, wfp);
chunk -= sizeof(buffer);
}
if (chunk)
- fread(buffer, chunk, 1, wfp);
+ ret=fread(buffer, chunk, 1, wfp);
}
}
fclose(wfp);
- if (!gotdata)
- {
+ if (!gotdata) {
fprintf(stderr, "Error: No data chunk fount in file.\n");
return;
}
{
FILE *fp;
- if (argc <= 1)
- {
+ if (argc <= 1) {
usage:
printf("Usage:\n");
printf("%s wave2alaw <wav file> <alaw file>\n", argv[0]);
return(0);
}
- if (!strcmp(argv[1], "wave2alaw"))
- {
+ if (!strcmp(argv[1], "wave2alaw")) {
if (argc <= 3)
goto usage;
- if ((fp=fopen(argv[3],"w")))
- {
+ if ((fp=fopen(argv[3],"w"))) {
write_wav(fp,argv[2],'a');
fclose(fp);
- } else
- {
+ } else {
printf("Cannot open isdn file %s\n",argv[3]);
}
} else
- if (!strcmp(argv[1], "wave2ulaw"))
- {
+ if (!strcmp(argv[1], "wave2ulaw")) {
if (argc <= 3)
goto usage;
- if ((fp=fopen(argv[3],"w")))
- {
+ if ((fp=fopen(argv[3],"w"))) {
write_wav(fp,argv[2],'u');
fclose(fp);
- } else
- {
+ } else {
printf("Cannot open isdn file %s\n",argv[3]);
}
} else
- if (!strcmp(argv[1], "tone2alaw"))
- {
+ if (!strcmp(argv[1], "tone2alaw")) {
if (argc <= 7)
goto usage;
- if ((fp=fopen(argv[7],"a")))
- {
+ if ((fp=fopen(argv[7],"a"))) {
write_tone(fp,strtod(argv[2],NULL),strtod(argv[3],NULL),atoi(argv[4]),atoi(argv[5]),atoi(argv[6]),'a');
fclose(fp);
- } else
- {
+ } else {
printf("Cannot open isdn file %s\n",argv[7]);
}
} else
- if (!strcmp(argv[1], "tone2ulaw"))
- {
+ if (!strcmp(argv[1], "tone2ulaw")) {
if (argc <= 7)
goto usage;
- if ((fp=fopen(argv[7],"a")))
- {
+ if ((fp=fopen(argv[7],"a"))) {
write_tone(fp,atoi(argv[2]),atoi(argv[3]),atoi(argv[4]),atoi(argv[5]),atoi(argv[6]),'u');
fclose(fp);
- } else
- {
+ } else {
printf("Cannot open isdn file %s\n",argv[7]);
}
} else
projects / lcr.git / blobdiff