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

To fix warning for unused variable. And fix some warning in test.

Browse Source 
Review URL: http://webrtc-codereview.appspot.com/131010

git-svn-id: http://webrtc.googlecode.com/svn/trunk@500 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
turajs@google.com 2011-08-31 21:28:08 +00:00
parent eaf3185105
commit ebb2744337
4 changed files with 112 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/modules/audio_coding/codecs/iSAC/fix/source/codec.h
View File

@ -44,8 +44,7 @@ int WebRtcIsacfix_EncodeImpl(WebRtc_Word16 *in,
int WebRtcIsacfix_EncodeStoredData(ISACFIX_EncInst_t *ISACenc_obj, int WebRtcIsacfix_EncodeStoredData(ISACFIX_EncInst_t *ISACenc_obj,
int BWnumber, int BWnumber,
float scale, float scale);
WebRtc_Word16 CodingMode);
/************************** initialization functions *************************/ /************************** initialization functions *************************/

3
src/modules/audio_coding/codecs/iSAC/fix/source/encode.c
View File

@ -485,8 +485,7 @@ int WebRtcIsacfix_EncodeImpl(WebRtc_Word16 *in,
when calling the encoder. */ when calling the encoder. */
int WebRtcIsacfix_EncodeStoredData(ISACFIX_EncInst_t *ISACenc_obj, int WebRtcIsacfix_EncodeStoredData(ISACFIX_EncInst_t *ISACenc_obj,
int BWnumber, int BWnumber,
float scale, float scale)
WebRtc_Word16 CodingMode)
{ {
int ii; int ii;
int status; int status;

3
src/modules/audio_coding/codecs/iSAC/fix/source/isacfix.c
View File

@ -453,8 +453,7 @@ WebRtc_Word16 WebRtcIsacfix_GetNewBitStream(ISACFIX_MainStruct *ISAC_main_inst,
stream_len = WebRtcIsacfix_EncodeStoredData(&ISAC_inst->ISACenc_obj, stream_len = WebRtcIsacfix_EncodeStoredData(&ISAC_inst->ISACenc_obj,
bweIndex, bweIndex,
scale, scale);
ISAC_inst->CodingMode);
if (stream_len<0) { if (stream_len<0) {
ISAC_inst->errorcode = - stream_len; ISAC_inst->errorcode = - stream_len;
return -1; return -1;

174
src/modules/audio_coding/codecs/iSAC/fix/test/kenny.c
View File

@ -107,7 +107,6 @@ int main(int argc, char* argv[])
double starttime, runtime, length_file; double starttime, runtime, length_file;
WebRtc_Word16 stream_len = 0; WebRtc_Word16 stream_len = 0;
WebRtc_Word16 trans_len = 0;
WebRtc_Word16 framecnt, declen; WebRtc_Word16 framecnt, declen;
WebRtc_Word16 shortdata[FRAMESAMPLES_10ms]; WebRtc_Word16 shortdata[FRAMESAMPLES_10ms];
WebRtc_Word16 decoded[MAX_FRAMESAMPLES]; WebRtc_Word16 decoded[MAX_FRAMESAMPLES];
@ -174,48 +173,62 @@ int main(int argc, char* argv[])
printf("Usage:\n\n"); printf("Usage:\n\n");
printf("./kenny.exe [-F num][-I] bottleneck_value infile outfile \n\n"); printf("./kenny.exe [-F num][-I] bottleneck_value infile outfile \n\n");
printf("with:\n"); printf("with:\n");
printf("[-I] : if -I option is specified, the coder will use\n"); printf("[-I] :if -I option is specified, the coder will use\n");
printf(" an instantaneous Bottleneck value. If not, it\n"); printf(" an instantaneous Bottleneck value. If not, it\n");
printf(" will be an adaptive Bottleneck value.\n\n"); printf(" will be an adaptive Bottleneck value.\n\n");
printf("bottleneck_value : the value of the bottleneck provided either\n"); printf("bottleneck_value :the value of the bottleneck provided either\n");
printf(" as a fixed value (e.g. 25000) or\n"); printf(" as a fixed value (e.g. 25000) or\n");
printf(" read from a file (e.g. bottleneck.txt)\n\n"); printf(" read from a file (e.g. bottleneck.txt)\n\n");
printf("[-INITRATE num] : Set a new value for initial rate. Note! Only used in adaptive mode.\n\n"); printf("[-INITRATE num] :Set a new value for initial rate. Note! Only used"
printf("[-FL num] : Set (initial) frame length in msec. Valid length are 30 and 60 msec.\n\n"); " in adaptive mode.\n\n");
printf("[-FIXED_FL] : Frame length will be fixed to initial value.\n\n"); printf("[-FL num] :Set (initial) frame length in msec. Valid length"
printf("[-MAX num] : Set the limit for the payload size of iSAC in bytes. \n"); " are 30 and 60 msec.\n\n");
printf(" Minimum 100, maximum 400.\n\n"); printf("[-FIXED_FL] :Frame length will be fixed to initial value.\n\n");
printf("[-MAXRATE num] : Set the maxrate for iSAC in bits per second. \n"); printf("[-MAX num] :Set the limit for the payload size of iSAC"
printf(" Minimum 32000, maximum 53400.\n\n"); " in bytes. \n");
printf("[-F num] : if -F option is specified, the test function\n"); printf(" Minimum 100, maximum 400.\n\n");
printf(" will run the iSAC API fault scenario specified by the\n"); printf("[-MAXRATE num] :Set the maxrate for iSAC in bits per second. \n");
printf(" supplied number.\n"); printf(" Minimum 32000, maximum 53400.\n\n");
printf(" F 1 - Call encoder prior to init encoder call\n"); printf("[-F num] :if -F option is specified, the test function\n");
printf(" F 2 - Call decoder prior to init decoder call\n"); printf(" will run the iSAC API fault scenario specified"
printf(" F 3 - Call decoder prior to encoder call\n"); " by the\n");
printf(" F 4 - Call decoder with a too short coded sequence\n"); printf(" supplied number.\n");
printf(" F 5 - Call decoder with a too long coded sequence\n"); printf(" F 1 - Call encoder prior to init encoder call\n");
printf(" F 6 - Call decoder with random bit stream\n"); printf(" F 2 - Call decoder prior to init decoder call\n");
printf(" F 7 - Call init encoder/decoder at random during a call\n"); printf(" F 3 - Call decoder prior to encoder call\n");
printf(" F 8 - Call encoder/decoder without having allocated memory for \n"); printf(" F 4 - Call decoder with a too short coded"
printf(" encoder/decoder instance\n"); " sequence\n");
printf(" F 9 - Call decodeB without calling decodeA\n"); printf(" F 5 - Call decoder with a too long coded"
printf(" F 10 - Call decodeB with garbage data\n"); " sequence\n");
printf("[-PL num] : if -PL option is specified 0<num<100 will specify the\n"); printf(" F 6 - Call decoder with random bit stream\n");
printf(" percentage of packet loss\n\n"); printf(" F 7 - Call init encoder/decoder at random"
printf("[-G file] : if -G option is specified the file given is a .gns file\n"); " during a call\n");
printf(" that represents a network profile\n\n"); printf(" F 8 - Call encoder/decoder without having"
printf("[-NB num] : if -NB option, use the narrowband interfaces\n"); " allocated memory for \n");
printf(" num=1 => encode with narrowband encoder (infile is narrowband)\n"); printf(" encoder/decoder instance\n");
printf(" num=2 => decode with narrowband decoder (outfile is narrowband)\n\n"); printf(" F 9 - Call decodeB without calling decodeA\n");
printf("[-CE num] : Test of APIs used by Conference Engine.\n"); printf(" F 10 - Call decodeB with garbage data\n");
printf(" CE 1 - createInternal, freeInternal, getNewBitstream \n"); printf("[-PL num] : if -PL option is specified 0<num<100 will "
printf(" CE 2 - transcode, getBWE \n"); "specify the\n");
printf(" CE 3 - getSendBWE, setSendBWE. \n\n"); printf(" percentage of packet loss\n\n");
printf("[-RTP_INIT num] : if -RTP_INIT option is specified num will be the initial\n"); printf("[-G file] : if -G option is specified the file given is"
printf(" value of the rtp sequence number.\n\n"); " a .gns file\n");
printf("infile : Normal speech input file\n\n"); printf(" that represents a network profile\n\n");
printf("outfile : Speech output file\n\n"); printf("[-NB num] : if -NB option, use the narrowband interfaces\n");
printf(" num=1 => encode with narrowband encoder"
" (infile is narrowband)\n");
printf(" num=2 => decode with narrowband decoder"
" (outfile is narrowband)\n\n");
printf("[-CE num] : Test of APIs used by Conference Engine.\n");
printf(" CE 1 - createInternal, freeInternal,"
" getNewBitstream \n");
printf(" CE 2 - transcode, getBWE \n");
printf(" CE 3 - getSendBWE, setSendBWE. \n\n");
printf("[-RTP_INIT num] : if -RTP_INIT option is specified num will be"
" the initial\n");
printf(" value of the rtp sequence number.\n\n");
printf("infile : Normal speech input file\n\n");
printf("outfile : Speech output file\n\n");
printf("Example usage : \n\n"); printf("Example usage : \n\n");
printf("./kenny.exe -I bottleneck.txt speechIn.pcm speechOut.pcm\n\n"); printf("./kenny.exe -I bottleneck.txt speechIn.pcm speechOut.pcm\n\n");
exit(0); exit(0);
@ -243,7 +256,8 @@ int main(int argc, char* argv[])
rateBPS = atoi(argv[i + 1]); rateBPS = atoi(argv[i + 1]);
setControlBWE = 1; setControlBWE = 1;
if ((rateBPS < 10000) || (rateBPS > 32000)) { if ((rateBPS < 10000) || (rateBPS > 32000)) {
printf("\n%d is not a initial rate. Valid values are in the range 10000 to 32000.\n", rateBPS); printf("\n%d is not a initial rate. "
"Valid values are in the range 10000 to 32000.\n", rateBPS);
exit(0); exit(0);
} }
printf("\nNew initial rate: %d\n", rateBPS); printf("\nNew initial rate: %d\n", rateBPS);
@ -254,7 +268,8 @@ int main(int argc, char* argv[])
if (!strcmp ("-FL", argv[i])) { if (!strcmp ("-FL", argv[i])) {
framesize = atoi(argv[i + 1]); framesize = atoi(argv[i + 1]);
if ((framesize != 30) && (framesize != 60)) { if ((framesize != 30) && (framesize != 60)) {
printf("\n%d is not a valid frame length. Valid length are 30 and 60 msec.\n", framesize); printf("\n%d is not a valid frame length. "
"Valid length are 30 and 60 msec.\n", framesize);
exit(0); exit(0);
} }
printf("\nFrame Length: %d\n", framesize); printf("\nFrame Length: %d\n", framesize);
@ -286,7 +301,8 @@ int main(int argc, char* argv[])
testNum = atoi(argv[i + 1]); testNum = atoi(argv[i + 1]);
printf("\nFault test: %d\n", testNum); printf("\nFault test: %d\n", testNum);
if (testNum < 1 || testNum > 10) { if (testNum < 1 || testNum > 10) {
printf("\n%d is not a valid Fault Scenario number. Valid Fault Scenarios are numbered 1-10.\n", testNum); printf("\n%d is not a valid Fault Scenario number."
" Valid Fault Scenarios are numbered 1-10.\n", testNum);
exit(0); exit(0);
} }
i++; i++;
@ -301,7 +317,8 @@ int main(int argc, char* argv[])
exit( 0 ); exit( 0 );
} }
if( packetLossPercent > 0 ) { if( packetLossPercent > 0 ) {
printf( "\nSimulating %d %% of independent packet loss\n", packetLossPercent ); printf( "\nSimulating %d %% of independent packet loss\n",
packetLossPercent );
} else { } else {
printf( "\nNo Packet Loss Is Simulated \n" ); printf( "\nNo Packet Loss Is Simulated \n" );
} }
@ -313,7 +330,8 @@ int main(int argc, char* argv[])
printf( "\n couldn't open the frameloss file: %s\n", argv[i+1] ); printf( "\n couldn't open the frameloss file: %s\n", argv[i+1] );
exit( 0 ); exit( 0 );
} }
printf( "\nSimulating packet loss through the given channel file: %s\n", argv[i+1] ); printf( "\nSimulating packet loss through the given "
"channel file: %s\n", argv[i+1] );
} }
i++; i++;
} }
@ -349,7 +367,8 @@ int main(int argc, char* argv[])
i++; i++;
scale = (float)atof( argv[i+1] ); scale = (float)atof( argv[i+1] );
} else if (testCE < 1 || testCE > 3) { } else if (testCE < 1 || testCE > 3) {
printf("\n%d is not a valid CE-test number, valid Fault Scenarios are numbered 1-3\n", testCE); printf("\n%d is not a valid CE-test number, valid Fault "
"Scenarios are numbered 1-3\n", testCE);
exit(0); exit(0);
} }
i++; i++;
@ -555,14 +574,18 @@ int main(int argc, char* argv[])
/* Encode */ /* Encode */
stream_len = WebRtcIsacfix_Encode(ISAC_main_inst, stream_len = WebRtcIsacfix_Encode(ISAC_main_inst,
shortdata, shortdata,
streamdata); (WebRtc_Word16*)streamdata);
/* If packet is ready, and CE testing, call the different API functions /* If packet is ready, and CE testing, call the different API functions
from the internal API. */ from the internal API. */
if (stream_len>0) { if (stream_len>0) {
if (testCE == 1) { if (testCE == 1) {
err = WebRtcIsacfix_ReadBwIndex(streamdata, &bwe); err = WebRtcIsacfix_ReadBwIndex((WebRtc_Word16*)streamdata, &bwe);
stream_len = WebRtcIsacfix_GetNewBitStream(ISAC_main_inst, bwe, scale, streamdata); stream_len = WebRtcIsacfix_GetNewBitStream(
ISAC_main_inst,
bwe,
scale,
(WebRtc_Word16*)streamdata);
} else if (testCE == 2) { } else if (testCE == 2) {
/* transcode function not supported */ /* transcode function not supported */
} else if (testCE == 3) { } else if (testCE == 3) {
@ -586,9 +609,13 @@ int main(int argc, char* argv[])
} }
} }
} else { } else {
#ifdef WEBRTC_ISAC_FIX_NB_CALLS_ENABLED
stream_len = WebRtcIsacfix_EncodeNb(ISAC_main_inst, stream_len = WebRtcIsacfix_EncodeNb(ISAC_main_inst,
shortdata, shortdata,
streamdata); streamdata);
#else
stream_len = -1;
#endif
} }
} }
else else
@ -702,17 +729,24 @@ int main(int argc, char* argv[])
/* iSAC decoding */ /* iSAC decoding */
if( lostFrame && framecnt > 0) { if( lostFrame && framecnt > 0) {
if (nbTest !=2) { if (nbTest !=2) {
declen = WebRtcIsacfix_DecodePlc( ISAC_main_inst, decoded, prevFrameSize ); declen = WebRtcIsacfix_DecodePlc(ISAC_main_inst,
decoded, prevFrameSize );
} else { } else {
declen = WebRtcIsacfix_DecodePlcNb( ISAC_main_inst, decoded, prevFrameSize ); #ifdef WEBRTC_ISAC_FIX_NB_CALLS_ENABLED
declen = WebRtcIsacfix_DecodePlcNb(ISAC_main_inst, decoded,
prevFrameSize );
#else
declen = -1;
#endif
} }
lostPackets++; lostPackets++;
} else { } else {
if (nbTest !=2 ) { if (nbTest !=2 ) {
short FL; short FL;
/* Call getFramelen, only used here for function test */ /* Call getFramelen, only used here for function test */
err = WebRtcIsacfix_ReadFrameLen(streamdata, &FL); err = WebRtcIsacfix_ReadFrameLen((WebRtc_Word16*)streamdata, &FL);
declen = WebRtcIsacfix_Decode( ISAC_main_inst, streamdata, stream_len, decoded, speechType ); declen = WebRtcIsacfix_Decode( ISAC_main_inst, streamdata, stream_len,
decoded, speechType );
/* Error check */ /* Error check */
if (err<0 || declen<0 || FL!=declen) { if (err<0 || declen<0 || FL!=declen) {
errtype=WebRtcIsacfix_GetErrorCode(ISAC_main_inst); errtype=WebRtcIsacfix_GetErrorCode(ISAC_main_inst);
@ -721,7 +755,12 @@ int main(int argc, char* argv[])
prevFrameSize = declen/480; prevFrameSize = declen/480;
} else { } else {
declen = WebRtcIsacfix_DecodeNb( ISAC_main_inst, streamdata, stream_len, decoded, speechType ); #ifdef WEBRTC_ISAC_FIX_NB_CALLS_ENABLED
declen = WebRtcIsacfix_DecodeNb( ISAC_main_inst, streamdata,
stream_len, decoded, speechType );
#else
declen = -1;
#endif
prevFrameSize = declen/240; prevFrameSize = declen/240;
} }
} }
@ -734,8 +773,8 @@ int main(int argc, char* argv[])
/* Write decoded speech frame to file */ /* Write decoded speech frame to file */
fwrite(decoded, sizeof(WebRtc_Word16), declen, outp); fwrite(decoded, sizeof(WebRtc_Word16), declen, outp);
// fprintf( ratefile, "%f \n", stream_len / ( ((double)declen)/ ((double)FS) ) * 8 ); // fprintf( ratefile, "%f \n", stream_len / ( ((double)declen)/
// ((double)FS) ) * 8 );
} else { } else {
lostPackets++; lostPackets++;
} }
@ -743,7 +782,8 @@ int main(int argc, char* argv[])
totalsmpls += declen; totalsmpls += declen;
totalbits += 8 * stream_len; 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
/* Error test number 10, garbage data */ /* Error test number 10, garbage data */
if (testNum == 10) { if (testNum == 10) {
@ -765,14 +805,17 @@ int main(int argc, char* argv[])
#endif /* _DEBUG */ #endif /* _DEBUG */
} }
printf("\nLost Frames %d ~ %4.1f%%\n", lostPackets, (double)lostPackets/(double)framecnt*100.0 ); printf("\nLost Frames %d ~ %4.1f%%\n", lostPackets,
(double)lostPackets/(double)framecnt*100.0 );
printf("\n\ntotal bits = %d bits", totalbits); 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"); printf("\n");
#ifdef _DEBUG #ifdef _DEBUG
/* fprintf(stderr,"\n\ntotal bits = %d bits", totalbits); /* fprintf(stderr,"\n\ntotal bits = %d bits", totalbits);
fprintf(stderr,"\nmeasured average bitrate = %0.3f kbits/s", (double)totalbits *(FS/1000) / totalsmpls); fprintf(stderr,"\nmeasured average bitrate = %0.3f kbits/s",
(double)totalbits *(FS/1000) / totalsmpls);
fprintf(stderr,"\n"); fprintf(stderr,"\n");
*/ */
#endif /* _DEBUG */ #endif /* _DEBUG */
@ -783,7 +826,8 @@ int main(int argc, char* argv[])
runtime = (double)(((double)clock()/(double)CLOCKS_PER_SEC)-starttime); runtime = (double)(((double)clock()/(double)CLOCKS_PER_SEC)-starttime);
length_file = ((double)framecnt*(double)declen/FS); length_file = ((double)framecnt*(double)declen/FS);
printf("\n\nLength of speech file: %.1f s\n", length_file); 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("\n\n_______________________________________________\n"); printf("\n\n_______________________________________________\n");
fclose(inp); fclose(inp);