generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Run clang-format --style=Chromium on four files I'm otherwise touching.

Browse Source 
The existing style in these files is pretty inconsistent and wildly divergent
from most of WebRTC/Chromium; clang-formatting them not only makes them easier
to read, it makes me see fewer presubmit errors when I try to touch the files to
make other changes.

BUG=none
R=kwiberg@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/52019004

Cr-Commit-Position: refs/heads/master@{#9364}
This commit is contained in:
Peter Kasting 2015-06-03 12:32:41 -07:00
parent a9952cdd0e
commit 248b0b0790
4 changed files with 3165 additions and 3357 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

231
webrtc/modules/audio_coding/codecs/isac/fix/test/test_iSACfixfloat.c
View File

@ -22,7 +22,6 @@
#include "isac.h"
#include "isacfix.h"
/* max number of samples per frame (= 60 ms frame) */
#define MAX_FRAMESAMPLES 960
/* number of samples per 10ms frame */
@ -30,20 +29,14 @@
/* sampling frequency (Hz) */
#define FS 16000
/* Runtime statistics */
#include <time.h>
#define CLOCKS_PER_SEC 1000
// FILE *histfile, *ratefile;
/* function for reading audio data from PCM file */
int readframe(int16_t* data, FILE* inp, int length) {
short k, rlen, status = 0;
rlen = fread(data, sizeof(int16_t), length, inp);
@ -66,8 +59,7 @@ typedef struct {
void get_arrival_time(int current_framesamples, /* samples */
int packet_size, /* bytes */
int bottleneck, /* excluding headers; bits/s */
BottleNeckModel *BN_data)
{
BottleNeckModel* BN_data) {
const int HeaderSize = 35;
int HeaderRate;
@ -76,7 +68,8 @@ void get_arrival_time(int current_framesamples, /* samples */
/* everything in samples */
BN_data->sample_count = BN_data->sample_count + current_framesamples;
BN_data->arrival_time += ((packet_size + HeaderSize) * 8 * FS) / (bottleneck + HeaderRate);
BN_data->arrival_time +=
((packet_size + HeaderSize) * 8 * FS) / (bottleneck + HeaderRate);
BN_data->send_time += current_framesamples;
if (BN_data->arrival_time < BN_data->sample_count)
@ -85,16 +78,12 @@ void get_arrival_time(int current_framesamples, /* samples */
BN_data->rtp_number++;
}
int main(int argc, char* argv[])
{
char inname[50], outname[50], bottleneck_file[50], bitfilename[60], bitending[10]="_bits.pcm";
int main(int argc, char* argv[]) {
char inname[50], outname[50], bottleneck_file[50], bitfilename[60],
bitending[10] = "_bits.pcm";
FILE* inp, *outp, *f_bn, *bitsp;
int framecnt, endfile;
int i, j, errtype, plc = 0;
int16_t CodingMode;
int16_t bottleneck;
@ -129,9 +118,6 @@ int main(int argc, char* argv[])
int totalsmpls = 0;
#endif /* _DEBUG */
/* only one structure used for ISAC encoder */
ISAC_MainStruct* ISAC_main_inst;
ISACFIX_MainStruct* ISACFIX_main_inst;
@ -146,7 +132,6 @@ int main(int argc, char* argv[])
fclose(fy);
#endif /* _DEBUG */
// histfile = fopen("histo.dat", "ab");
// ratefile = fopen("rates.dat", "ab");
@ -162,28 +147,42 @@ int main(int argc, char* argv[])
printf("./kenny.exe [-I] bottleneck_value infile outfile \n\n");
printf("with:\n");
printf("[-I] : if -I option is specified, the coder will use\n");
printf(" an instantaneous Bottleneck value. If not, it\n");
printf(" will be an adaptive Bottleneck value.\n\n");
printf("bottleneck_value : the value of the bottleneck provided either\n");
printf(" as a fixed value (e.g. 25000) or\n");
printf(" read from a file (e.g. bottleneck.txt)\n\n");
printf(
"[-I] : if -I option is specified, the coder "
"will use\n");
printf(
" an instantaneous Bottleneck value. If "
"not, it\n");
printf(
" will be an adaptive Bottleneck "
"value.\n\n");
printf(
"bottleneck_value : the value of the bottleneck provided "
"either\n");
printf(
" as a fixed value (e.g. 25000) or\n");
printf(
" read from a file (e.g. "
"bottleneck.txt)\n\n");
printf("[-m] mode : Mode (encoder - decoder):\n");
printf(" : 0 - float - float \n");
printf(" : 1 - float - fix \n");
printf(" : 2 - fix - float \n");
printf(
" : 0 - float - float \n");
printf(
" : 1 - float - fix \n");
printf(
" : 2 - fix - float \n");
printf(" : 3 - fix - fix \n");
printf("[-PLC] : Test PLC packetlosses\n");
printf("[-NB] num : Test NB interfaces, num=1 encNB, num=2 decNB\n");
printf(
"[-NB] num : Test NB interfaces, num=1 encNB, num=2 "
"decNB\n");
printf("infile : Normal speech input file\n\n");
printf("outfile : Speech output file\n\n");
printf("Example usage:\n\n");
printf("./kenny.exe -I bottleneck.txt -m 1 speechIn.pcm speechOut.pcm\n\n");
exit(0);
}
printf("--------------------START---------------------\n\n");
WebRtcIsac_version(version_number);
printf("iSAC FLOAT version %s \n", version_number);
@ -192,10 +191,8 @@ int main(int argc, char* argv[])
CodingMode = 0;
tmp = 1;
for (i = 1; i < argc;i++)
{
if (!strcmp ("-I", argv[i]))
{
for (i = 1; i < argc; i++) {
if (!strcmp("-I", argv[i])) {
printf("\nInstantaneous BottleNeck\n");
CodingMode = 1;
i++;
@ -207,17 +204,14 @@ int main(int argc, char* argv[])
i++;
}
if (!strcmp ("-PLC", argv[i]))
{
if (!strcmp("-PLC", argv[i])) {
plc = 1;
}
if (!strcmp ("-NB", argv[i]))
{
if (!strcmp("-NB", argv[i])) {
nbTest = atoi(argv[i + 1]);
i++;
}
}
if (mode < 0) {
@ -225,25 +219,20 @@ int main(int argc, char* argv[])
exit(0);
}
if (CodingMode == 0)
{
if (CodingMode == 0) {
printf("\nAdaptive BottleNeck\n");
}
/* Get Bottleneck value */
bottleneck = atoi(argv[2 - tmp]);
if (bottleneck == 0)
{
if (bottleneck == 0) {
sscanf(argv[2 - tmp], "%s", bottleneck_file);
f_bn = fopen(bottleneck_file, "rb");
if (f_bn == NULL)
{
printf("No value provided for BottleNeck and cannot read file %s.\n", bottleneck_file);
if (f_bn == NULL) {
printf("No value provided for BottleNeck and cannot read file %s.\n",
bottleneck_file);
exit(0);
}
else {
} else {
printf("reading bottleneck rates from file %s\n\n", bottleneck_file);
if (fscanf(f_bn, "%d", &bottleneck) == EOF) {
/* Set pointer to beginning of file */
@ -258,14 +247,10 @@ int main(int argc, char* argv[])
* fprintf(fid, '%d\n', BottleNeck_10ms); fclose(fid);
*/
}
}
else
{
} else {
printf("\nfixed bottleneck rate of %d bits/s\n\n", bottleneck);
}
/* Get Input and Output files */
sscanf(argv[argc - 2], "%s", inname);
sscanf(argv[argc - 1], "%s", outname);
@ -295,11 +280,8 @@ int main(int argc, char* argv[])
}
printf("Bitstream:%s\n\n", bitfilename);
starttime = clock() / (double)CLOCKS_PER_SEC; /* Runtime statistics */
/* Initialize the ISAC and BN structs */
WebRtcIsac_create(&ISAC_main_inst);
/* WebRtcIsacfix_AssignSize(&sss);
@ -392,7 +374,6 @@ int main(int argc, char* argv[])
}
}
} else if (mode == 3) {
printf("Coding mode: Encode using FIX, decode using FIX \n\n");
WebRtcIsacfix_EncoderInit(ISACFIX_main_inst, CodingMode);
@ -425,9 +406,7 @@ int main(int argc, char* argv[])
}
#endif
while (endfile == 0) {
cur_framesmpls = 0;
while (1) {
/* Read 10 ms speech block */
@ -439,9 +418,8 @@ int main(int argc, char* argv[])
/* iSAC encoding */
if (mode == 0 || mode == 1) {
stream_len = WebRtcIsac_Encode(ISAC_main_inst,
shortdata,
(uint8_t*)streamdata);
stream_len =
WebRtcIsac_Encode(ISAC_main_inst, shortdata, (uint8_t*)streamdata);
if (stream_len < 0) {
/* exit if returned with error */
errtype = WebRtcIsac_GetErrorCode(ISAC_main_inst);
@ -451,12 +429,11 @@ int main(int argc, char* argv[])
} else if (mode == 2 || mode == 3) {
/* iSAC encoding */
if (nbTest != 1)
stream_len = WebRtcIsacfix_Encode(
ISACFIX_main_inst,
shortdata,
stream_len = WebRtcIsacfix_Encode(ISACFIX_main_inst, shortdata,
(uint8_t*)streamdata);
else
stream_len = WebRtcIsacfix_EncodeNb(ISACFIX_main_inst, shortdata, streamdata);
stream_len =
WebRtcIsacfix_EncodeNb(ISACFIX_main_inst, shortdata, streamdata);
if (stream_len < 0) {
/* exit if returned with error */
@ -484,21 +461,19 @@ int main(int argc, char* argv[])
}
/* exit encoder loop if the encoder returned a bitstream */
if (stream_len != 0) break;
if (stream_len != 0)
break;
}
fwrite(streamdata, 1, stream_len, bitsp); /* NOTE! Writes bytes to file */
/* simulate packet handling through NetEq and the modem */
get_arrival_time(cur_framesmpls, stream_len, bottleneck,
&BN_data);
get_arrival_time(cur_framesmpls, stream_len, bottleneck, &BN_data);
//*****************************
if (1) {
if (mode == 0) {
err = WebRtcIsac_UpdateBwEstimate(ISAC_main_inst,
streamdata,
stream_len,
BN_data.rtp_number,
err = WebRtcIsac_UpdateBwEstimate(ISAC_main_inst, streamdata,
stream_len, BN_data.rtp_number,
BN_data.arrival_time);
if (err < 0) {
@ -508,11 +483,8 @@ int main(int argc, char* argv[])
// exit(EXIT_FAILURE);
}
/* iSAC decoding */
declen = WebRtcIsac_Decode(ISAC_main_inst,
streamdata,
stream_len,
decoded,
speechType);
declen = WebRtcIsac_Decode(ISAC_main_inst, streamdata, stream_len,
decoded, speechType);
if (declen <= 0) {
/* exit if returned with error */
errtype = WebRtcIsac_GetErrorCode(ISAC_main_inst);
@ -520,16 +492,11 @@ int main(int argc, char* argv[])
// exit(EXIT_FAILURE);
}
} else if (mode == 1) {
err = WebRtcIsac_UpdateBwEstimate(ISAC_main_inst,
streamdata,
stream_len,
BN_data.rtp_number,
err = WebRtcIsac_UpdateBwEstimate(ISAC_main_inst, streamdata,
stream_len, BN_data.rtp_number,
BN_data.arrival_time);
err = WebRtcIsacfix_UpdateBwEstimate1(ISACFIX_main_inst,
streamdata,
stream_len,
BN_data.rtp_number,
err = WebRtcIsacfix_UpdateBwEstimate1(ISACFIX_main_inst, streamdata,
stream_len, BN_data.rtp_number,
BN_data.arrival_time);
if (err < 0) {
/* exit if returned with error */
@ -538,11 +505,8 @@ int main(int argc, char* argv[])
// exit(EXIT_FAILURE);
}
declen = WebRtcIsac_Decode(ISAC_main_inst,
streamdata,
stream_len,
decoded,
speechType);
declen = WebRtcIsac_Decode(ISAC_main_inst, streamdata, stream_len,
decoded, speechType);
/* iSAC decoding */
if (plc && (framecnt + 1) % 10 == 0) {
@ -552,17 +516,11 @@ int main(int argc, char* argv[])
declen = WebRtcIsacfix_DecodePlcNb(ISACFIX_main_inst, decoded, 1);
} else {
if (nbTest != 2)
declen = WebRtcIsacfix_Decode(ISACFIX_main_inst,
streamdata,
stream_len,
decoded,
speechType);
declen = WebRtcIsacfix_Decode(ISACFIX_main_inst, streamdata,
stream_len, decoded, speechType);
else
declen = WebRtcIsacfix_DecodeNb(ISACFIX_main_inst,
streamdata,
stream_len,
decoded,
speechType);
declen = WebRtcIsacfix_DecodeNb(ISACFIX_main_inst, streamdata,
stream_len, decoded, speechType);
}
if (declen <= 0) {
@ -572,16 +530,12 @@ int main(int argc, char* argv[])
// exit(EXIT_FAILURE);
}
} else if (mode == 2) {
err = WebRtcIsacfix_UpdateBwEstimate1(ISACFIX_main_inst,
streamdata,
stream_len,
BN_data.rtp_number,
err = WebRtcIsacfix_UpdateBwEstimate1(ISACFIX_main_inst, streamdata,
stream_len, BN_data.rtp_number,
BN_data.arrival_time);
err = WebRtcIsac_UpdateBwEstimate(ISAC_main_inst,
streamdata,
stream_len,
BN_data.rtp_number,
err = WebRtcIsac_UpdateBwEstimate(ISAC_main_inst, streamdata,
stream_len, BN_data.rtp_number,
BN_data.arrival_time);
if (err < 0) {
@ -591,11 +545,8 @@ int main(int argc, char* argv[])
// exit(EXIT_FAILURE);
}
/* iSAC decoding */
declen = WebRtcIsac_Decode(ISAC_main_inst,
streamdata,
stream_len,
decoded,
speechType);
declen = WebRtcIsac_Decode(ISAC_main_inst, streamdata, stream_len,
decoded, speechType);
if (declen <= 0) {
/* exit if returned with error */
errtype = WebRtcIsac_GetErrorCode(ISAC_main_inst);
@ -603,12 +554,9 @@ int main(int argc, char* argv[])
// exit(EXIT_FAILURE);
}
} else if (mode == 3) {
err = WebRtcIsacfix_UpdateBwEstimate(ISACFIX_main_inst,
streamdata,
stream_len,
BN_data.rtp_number,
BN_data.send_time,
BN_data.arrival_time);
err = WebRtcIsacfix_UpdateBwEstimate(
ISACFIX_main_inst, streamdata, stream_len, BN_data.rtp_number,
BN_data.send_time, BN_data.arrival_time);
if (err < 0) {
/* exit if returned with error */
@ -625,17 +573,11 @@ int main(int argc, char* argv[])
declen = WebRtcIsacfix_DecodePlcNb(ISACFIX_main_inst, decoded, 1);
} else {
if (nbTest != 2)
declen = WebRtcIsacfix_Decode(ISACFIX_main_inst,
streamdata,
stream_len,
decoded,
speechType);
declen = WebRtcIsacfix_Decode(ISACFIX_main_inst, streamdata,
stream_len, decoded, speechType);
else
declen = WebRtcIsacfix_DecodeNb(ISACFIX_main_inst,
streamdata,
stream_len,
decoded,
speechType);
declen = WebRtcIsacfix_DecodeNb(ISACFIX_main_inst, streamdata,
stream_len, decoded, speechType);
}
if (declen <= 0) {
/* exit if returned with error */
@ -652,24 +594,23 @@ int main(int argc, char* argv[])
fprintf(stderr, " \rframe = %d", framecnt);
framecnt++;
#ifdef _DEBUG
totalsmpls += declen;
totalbits += 8 * stream_len;
kbps = ((double) FS) / ((double) cur_framesmpls) * 8.0 * stream_len / 1000.0;// kbits/s
kbps = ((double)FS) / ((double)cur_framesmpls) * 8.0 * stream_len /
1000.0; // kbits/s
fy = fopen("bit_rate.dat", "a");
fprintf(fy, "Frame %i = %0.14f\n", framecnt, kbps);
fclose(fy);
#endif /* _DEBUG */
}
#ifdef _DEBUG
printf("\n\ntotal bits = %d bits", totalbits);
printf("\nmeasured average bitrate = %0.3f kbits/s", (double)totalbits *(FS/1000) / totalsmpls);
printf("\nmeasured average bitrate = %0.3f kbits/s",
(double)totalbits * (FS / 1000) / totalsmpls);
printf("\n");
#endif /* _DEBUG */
@ -677,7 +618,8 @@ int main(int argc, char* argv[])
runtime = (double)(clock() / (double)CLOCKS_PER_SEC - starttime);
length_file = ((double)framecnt * (double)declen / FS);
printf("\n\nLength of speech file: %.1f s\n", length_file);
printf("Time to run iSAC: %.2f s (%.2f %% of realtime)\n\n", runtime, (100*runtime/length_file));
printf("Time to run iSAC: %.2f s (%.2f %% of realtime)\n\n", runtime,
(100 * runtime / length_file));
printf("---------------------END----------------------\n");
fclose(inp);
@ -686,13 +628,8 @@ int main(int argc, char* argv[])
WebRtcIsac_Free(ISAC_main_inst);
WebRtcIsacfix_Free(ISACFIX_main_inst);
// fclose(histfile);
// fclose(ratefile);
return 0;
}

640
webrtc/modules/audio_coding/codecs/isac/main/test/ReleaseTest-API/ReleaseTest-API.cc
View File

File diff suppressed because it is too large Load Diff

247
webrtc/modules/audio_coding/codecs/isac/main/test/simpleKenny.c
View File

@ -47,8 +47,7 @@
unsigned long framecnt = 0;
int main(int argc, char* argv[])
{
int main(int argc, char* argv[]) {
//--- File IO ----
FILE* inp;
FILE* outp;
@ -109,7 +108,6 @@ int main(int argc, char* argv[])
int onlyEncode;
int onlyDecode;
BottleNeckModel packetData;
packetData.arrival_time = 0;
packetData.sample_count = 0;
@ -117,8 +115,7 @@ int main(int argc, char* argv[])
memset(hist, 0, sizeof(hist));
/* handling wrong input arguments in the command line */
if(argc < 5)
{
if (argc < 5) {
int size;
WebRtcIsac_AssignSize(&size);
@ -128,22 +125,31 @@ int main(int argc, char* argv[])
printf("%s infile outfile -bn bottelneck [options] \n\n", argv[0]);
printf("with:\n");
printf("-I................... indicates encoding in instantaneous mode.\n");
printf("-bn bottleneck....... the value of the bottleneck in bit/sec, e.g. 39742,\n");
printf(" in instantaneous (channel-independent) mode.\n\n");
printf(
"-bn bottleneck....... the value of the bottleneck in bit/sec, e.g. "
"39742,\n");
printf(
" in instantaneous (channel-independent) "
"mode.\n\n");
printf("infile............... Normal speech input file\n\n");
printf("outfile.............. Speech output file\n\n");
printf("OPTIONS\n");
printf("-------\n");
printf("-fs sampFreq......... sampling frequency of codec 16 or 32 (default) kHz.\n");
printf(
"-fs sampFreq......... sampling frequency of codec 16 or 32 (default) "
"kHz.\n");
printf("-plim payloadLim..... payload limit in bytes,\n");
printf(" default is the maximum possible.\n");
printf("-rlim rateLim........ rate limit in bits/sec, \n");
printf(" default is the maimum possible.\n");
printf("-h file.............. record histogram and *append* to 'file'.\n");
printf("-ave file............ record average rate of 3 sec intervales and *append* to 'file'.\n");
printf(
"-ave file............ record average rate of 3 sec intervales and "
"*append* to 'file'.\n");
printf("-ploss............... packet-loss percentage.\n");
printf("-enc................. do only encoding and store the bit-stream\n");
printf("-dec................. the input file is a bit-stream, decode it.\n");
printf(
"-dec................. the input file is a bit-stream, decode it.\n");
printf("\n");
printf("Example usage:\n\n");
@ -154,8 +160,6 @@ int main(int argc, char* argv[])
exit(0);
}
/* Get Bottleneck value */
bottleneck = readParamInt(argc, argv, "-bn", 50000);
fprintf(stderr, "\nfixed bottleneck rate of %d bits/s\n\n", bottleneck);
@ -165,57 +169,46 @@ int main(int argc, char* argv[])
sscanf(argv[2], "%s", outname);
codingMode = readSwitch(argc, argv, "-I");
sampFreqKHz = (int16_t)readParamInt(argc, argv, "-fs", 32);
if(readParamString(argc, argv, "-h", histFileName, 500) > 0)
{
if (readParamString(argc, argv, "-h", histFileName, 500) > 0) {
histFile = fopen(histFileName, "a");
if(histFile == NULL)
{
if (histFile == NULL) {
printf("cannot open hist file %s", histFileName);
exit(0);
}
}
else
{
} else {
// NO recording of hitstogram
histFile = NULL;
}
packetLossPercent = readParamInt(argc, argv, "-ploss", 0);
if(readParamString(argc, argv, "-ave", averageFileName, 500) > 0)
{
if (readParamString(argc, argv, "-ave", averageFileName, 500) > 0) {
averageFile = fopen(averageFileName, "a");
if(averageFile == NULL)
{
if (averageFile == NULL) {
printf("cannot open file to write rate %s", averageFileName);
exit(0);
}
}
else
{
} else {
averageFile = NULL;
}
onlyEncode = readSwitch(argc, argv, "-enc");
onlyDecode = readSwitch(argc, argv, "-dec");
switch(sampFreqKHz)
{
case 16:
{
switch (sampFreqKHz) {
case 16: {
samplesIn10Ms = 160;
break;
}
case 32:
{
case 32: {
samplesIn10Ms = 320;
break;
}
default:
printf("A sampling frequency of %d kHz is not supported,\
valid values are 8 and 16.\n", sampFreqKHz);
printf(
"A sampling frequency of %d kHz is not supported,\
valid values are 8 and 16.\n",
sampFreqKHz);
exit(-1);
}
payloadLimit = (int16_t)readParamInt(argc, argv, "-plim", 400);
@ -255,8 +248,7 @@ valid values are 8 and 16.\n", sampFreqKHz);
err = WebRtcIsac_Create(&ISAC_main_inst);
WebRtcIsac_SetEncSampRate(ISAC_main_inst, sampFreqKHz * 1000);
WebRtcIsac_SetDecSampRate(ISAC_main_inst, sampFreqKHz >= 32 ? 32000 :
16000);
WebRtcIsac_SetDecSampRate(ISAC_main_inst, sampFreqKHz >= 32 ? 32000 : 16000);
/* Error check */
if (err < 0) {
fprintf(stderr, "\n\n Error in create.\n\n");
@ -267,13 +259,11 @@ valid values are 8 and 16.\n", sampFreqKHz);
endfile = 0;
/* Initialize encoder and decoder */
if(WebRtcIsac_EncoderInit(ISAC_main_inst, codingMode) < 0)
{
if (WebRtcIsac_EncoderInit(ISAC_main_inst, codingMode) < 0) {
printf("cannot initialize encoder\n");
return -1;
}
if(WebRtcIsac_DecoderInit(ISAC_main_inst) < 0)
{
if (WebRtcIsac_DecoderInit(ISAC_main_inst) < 0) {
printf("cannot initialize decoder\n");
return -1;
}
@ -291,32 +281,25 @@ valid values are 8 and 16.\n", sampFreqKHz);
// }
//}
if(codingMode == 1)
{
if(WebRtcIsac_Control(ISAC_main_inst, bottleneck, frameSize) < 0)
{
if (codingMode == 1) {
if (WebRtcIsac_Control(ISAC_main_inst, bottleneck, frameSize) < 0) {
printf("cannot set bottleneck\n");
return -1;
}
}
else
{
if(WebRtcIsac_ControlBwe(ISAC_main_inst, 15000, 30, 1) < 0)
{
} else {
if (WebRtcIsac_ControlBwe(ISAC_main_inst, 15000, 30, 1) < 0) {
printf("cannot configure BWE\n");
return -1;
}
}
if(WebRtcIsac_SetMaxPayloadSize(ISAC_main_inst, payloadLimit) < 0)
{
if (WebRtcIsac_SetMaxPayloadSize(ISAC_main_inst, payloadLimit) < 0) {
printf("cannot set maximum payload size %d.\n", payloadLimit);
return -1;
}
if (rateLimit < 106800) {
if(WebRtcIsac_SetMaxRate(ISAC_main_inst, rateLimit) < 0)
{
if (WebRtcIsac_SetMaxRate(ISAC_main_inst, rateLimit) < 0) {
printf("cannot set the maximum rate %d.\n", rateLimit);
return -1;
}
@ -330,91 +313,67 @@ valid values are 8 and 16.\n", sampFreqKHz);
// }
//#endif
while (endfile == 0)
{
while (endfile == 0) {
fprintf(stderr, " \rframe = %7li", framecnt);
//============== Readind from the file and encoding =================
cur_framesmpls = 0;
stream_len = 0;
if(onlyDecode)
{
if (onlyDecode) {
uint8_t auxUW8;
size_t auxSizet;
if(fread(&auxUW8, sizeof(uint8_t), 1, inp) < 1)
{
if (fread(&auxUW8, sizeof(uint8_t), 1, inp) < 1) {
break;
}
stream_len = ((uint8_t)auxUW8) << 8;
if(fread(&auxUW8, sizeof(uint8_t), 1, inp) < 1)
{
if (fread(&auxUW8, sizeof(uint8_t), 1, inp) < 1) {
break;
}
stream_len |= (uint16_t)auxUW8;
auxSizet = (size_t)stream_len;
if(fread(payload, 1, auxSizet, inp) < auxSizet)
{
if (fread(payload, 1, auxSizet, inp) < auxSizet) {
printf("last payload is corrupted\n");
break;
}
}
else
{
while(stream_len == 0)
{
} else {
while (stream_len == 0) {
// Read 10 ms speech block
endfile = readframe(shortdata, inp, samplesIn10Ms);
if(endfile)
{
if (endfile) {
break;
}
cur_framesmpls += samplesIn10Ms;
//-------- iSAC encoding ---------
stream_len = WebRtcIsac_Encode(
ISAC_main_inst,
shortdata,
payload);
stream_len = WebRtcIsac_Encode(ISAC_main_inst, shortdata, payload);
if(stream_len < 0)
{
if (stream_len < 0) {
// exit if returned with error
// errType=WebRtcIsac_GetErrorCode(ISAC_main_inst);
fprintf(stderr, "\nError in encoder\n");
getc(stdin);
exit(EXIT_FAILURE);
}
}
//===================================================================
if(endfile)
{
if (endfile) {
break;
}
rcuStreamLen = WebRtcIsac_GetRedPayload(
ISAC_main_inst, payloadRCU);
rcuStreamLen = WebRtcIsac_GetRedPayload(ISAC_main_inst, payloadRCU);
get_arrival_time(cur_framesmpls, stream_len, bottleneck, &packetData,
sampFreqKHz * 1000, sampFreqKHz * 1000);
if(WebRtcIsac_UpdateBwEstimate(ISAC_main_inst,
payload,
stream_len,
packetData.rtp_number,
packetData.sample_count,
packetData.arrival_time)
< 0)
{
if (WebRtcIsac_UpdateBwEstimate(
ISAC_main_inst, payload, stream_len, packetData.rtp_number,
packetData.sample_count, packetData.arrival_time) < 0) {
printf(" BWE Error at client\n");
return -1;
}
}
if(endfile)
{
if (endfile) {
break;
}
@ -422,20 +381,18 @@ valid values are 8 and 16.\n", sampFreqKHz);
packetCntr++;
hist[stream_len]++;
if(averageFile != NULL)
{
if (averageFile != NULL) {
tmpSumStreamLen += stream_len;
if(packetCntr == 100)
{
if (packetCntr == 100) {
// kbps
fprintf(averageFile, "%8.3f ", (double)tmpSumStreamLen * 8.0 / (30.0 * packetCntr));
fprintf(averageFile, "%8.3f ",
(double)tmpSumStreamLen * 8.0 / (30.0 * packetCntr));
packetCntr = 0;
tmpSumStreamLen = 0;
}
}
if(onlyEncode)
{
if (onlyEncode) {
uint8_t auxUW8;
auxUW8 = (uint8_t)(((stream_len & 0x7F00) >> 8) & 0xFF);
if (fwrite(&auxUW8, sizeof(uint8_t), 1, outp) != 1) {
@ -446,37 +403,21 @@ valid values are 8 and 16.\n", sampFreqKHz);
if (fwrite(&auxUW8, sizeof(uint8_t), 1, outp) != 1) {
return -1;
}
if (fwrite(payload, 1, stream_len,
outp) != (size_t)stream_len) {
if (fwrite(payload, 1, stream_len, outp) != (size_t)stream_len) {
return -1;
}
}
else
{
} else {
//======================= iSAC decoding ===========================
if((rand() % 100) < packetLossPercent)
{
declen = WebRtcIsac_DecodeRcu(
ISAC_main_inst,
payloadRCU,
rcuStreamLen,
decoded,
speechType);
if ((rand() % 100) < packetLossPercent) {
declen = WebRtcIsac_DecodeRcu(ISAC_main_inst, payloadRCU, rcuStreamLen,
decoded, speechType);
lostPacketCntr++;
}
else
{
declen = WebRtcIsac_Decode(
ISAC_main_inst,
payload,
stream_len,
decoded,
} else {
declen = WebRtcIsac_Decode(ISAC_main_inst, payload, stream_len, decoded,
speechType);
}
if(declen <= 0)
{
if (declen <= 0) {
// errType=WebRtcIsac_GetErrorCode(ISAC_main_inst);
fprintf(stderr, "\nError in decoder.\n");
getc(stdin);
@ -484,8 +425,7 @@ valid values are 8 and 16.\n", sampFreqKHz);
}
// Write decoded speech frame to file
if (fwrite(decoded, sizeof(int16_t),
declen, outp) != (size_t)declen) {
if (fwrite(decoded, sizeof(int16_t), declen, outp) != (size_t)declen) {
return -1;
}
cur_framesmpls = declen;
@ -493,12 +433,10 @@ valid values are 8 and 16.\n", sampFreqKHz);
// Update Statistics
framecnt++;
totalsmpls += cur_framesmpls;
if(stream_len > 0)
{
if (stream_len > 0) {
totalbits += 8 * stream_len;
}
if(rcuStreamLen > 0)
{
if (rcuStreamLen > 0) {
totalBitsRCU += 8 * rcuStreamLen;
}
}
@ -513,19 +451,14 @@ valid values are 8 and 16.\n", sampFreqKHz);
#ifdef WIN32
#ifdef HAVE_DEBUG_INFO
rateLB = ((double)debugInfo.lbBytes * 8. *
(sampFreqKHz)) / (double)totalsmpls;
rateUB = ((double)debugInfo.ubBytes * 8. *
(sampFreqKHz)) / (double)totalsmpls;
rateLB =
((double)debugInfo.lbBytes * 8. * (sampFreqKHz)) / (double)totalsmpls;
rateUB =
((double)debugInfo.ubBytes * 8. * (sampFreqKHz)) / (double)totalsmpls;
#endif
fprintf(bitrateFile, "%d %10u %d %6.3f %6.3f %6.3f\n",
sampFreqKHz,
framecnt,
bottleneck,
rateLB,
rateUB,
rate);
sampFreqKHz, framecnt, bottleneck, rateLB, rateUB, rate);
fclose(bitrateFile);
#endif // WIN32
@ -556,26 +489,24 @@ valid values are 8 and 16.\n", sampFreqKHz);
runtime = (double)(clock() / (double)CLOCKS_PER_SEC - starttime);
length_file = ((double)framecnt * (double)declen / (sampFreqKHz * 1000));
printf("Length of speech file................ %.1f s\n", length_file);
printf("Time to run iSAC..................... %.2f s (%.2f %% of realtime)\n\n",
printf(
"Time to run iSAC..................... %.2f s (%.2f %% of realtime)\n\n",
runtime, (100 * runtime / length_file));
#endif
printf("\n\n_______________________________________________\n");
if(histFile != NULL)
{
if (histFile != NULL) {
int n;
for(n = 0; n < 600; n++)
{
for (n = 0; n < 600; n++) {
fprintf(histFile, "%6d ", hist[n]);
}
fprintf(histFile, "\n");
fclose(histFile);
}
if(averageFile != NULL)
{
if(packetCntr > 0)
{
fprintf(averageFile, "%8.3f ", (double)tmpSumStreamLen * 8.0 / (30.0 * packetCntr));
if (averageFile != NULL) {
if (packetCntr > 0) {
fprintf(averageFile, "%8.3f ",
(double)tmpSumStreamLen * 8.0 / (30.0 * packetCntr));
}
fprintf(averageFile, "\n");
fclose(averageFile);
@ -586,7 +517,6 @@ valid values are 8 and 16.\n", sampFreqKHz);
WebRtcIsac_Free(ISAC_main_inst);
#ifdef CHANGE_OUTPUT_NAME
{
char* p;
@ -597,15 +527,12 @@ valid values are 8 and 16.\n", sampFreqKHz);
myExt[0] = '\0';
p = strchr(newOutName, '.');
if(p != NULL)
{
if (p != NULL) {
strcpy(myExt, p);
*p = '_';
p++;
*p = '\0';
}
else
{
} else {
strcat(newOutName, "_");
}
sprintf(bitRateStr, "%0.0fkbps", rate);
@ -617,10 +544,8 @@ valid values are 8 and 16.\n", sampFreqKHz);
exit(0);
}
#ifdef HAVE_DEBUG_INFO
int setupDebugStruct(debugStruct* str)
{
int setupDebugStruct(debugStruct* str) {
str->prevPacketLost = 0;
str->currPacketLost = 0;

604
webrtc/modules/audio_coding/neteq/test/RTPencode.cc
View File

File diff suppressed because it is too large Load Diff