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

To remove all calls involving scratch-memory

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

git-svn-id: http://webrtc.googlecode.com/svn/trunk@462 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
turajs@google.com 2011-08-26 16:03:49 +00:00
parent ac55f7b33c
commit 7f2bbbbefd
2 changed files with 376 additions and 395 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/modules/audio_coding/codecs/iLBC/main/test/iLBC_test.c
View File

@ -38,12 +38,6 @@
#define BLOCKL_MAX 240 #define BLOCKL_MAX 240
#define ILBCNOOFWORDS_MAX 25 #define ILBCNOOFWORDS_MAX 25
#define ILBCSCRATCHMEMSIZE 2156
#ifdef __ILBC_WITH_SCRATCHMEM
WebRtc_Word16 iLBC_ScratchMem[ILBCSCRATCHMEMSIZE];
WebRtc_Word16 size;
#endif
int main(int argc, char* argv[]) int main(int argc, char* argv[])
@ -152,13 +146,6 @@ int main(int argc, char* argv[])
WebRtcIlbcfix_EncoderCreate(&Enc_Inst); WebRtcIlbcfix_EncoderCreate(&Enc_Inst);
WebRtcIlbcfix_DecoderCreate(&Dec_Inst); WebRtcIlbcfix_DecoderCreate(&Dec_Inst);
#ifdef __ILBC_WITH_SCRATCHMEM
/* Assign scratch memory. Note that Enc and Dec can use the same area */
WebRtcIlbcfix_EncoderAssignScratchMem(Enc_Inst, iLBC_ScratchMem, &size);
if (size>ILBCSCRATCHMEMSIZE) { fprintf(stderr,"Error: Scratch not big enough"); exit(0); }
WebRtcIlbcfix_DecoderAssignScratchMem(Dec_Inst, iLBC_ScratchMem, &size);
if (size>ILBCSCRATCHMEMSIZE) { fprintf(stderr,"Error: Scratch not big enough"); exit(0); }
#endif
/* Initialization */ /* Initialization */
@ -236,4 +223,3 @@ int main(int argc, char* argv[])
return(0); return(0);
} }

9
src/modules/audio_coding/codecs/iLBC/main/test/iLBC_testprogram.c
View File

@ -195,12 +195,6 @@ int main(int argc, char* argv[])
WebRtcIlbcfix_EncoderInit(&Enc_Inst, mode); WebRtcIlbcfix_EncoderInit(&Enc_Inst, mode);
WebRtcIlbcfix_DecoderInit(&Dec_Inst, mode, 1); WebRtcIlbcfix_DecoderInit(&Dec_Inst, mode, 1);
#if __ILBC_WITH_SCRATCHMEM
// we can use the same scratch space for both encoder and decoder.
WebRtcIlbcfix_EncoderAssignScratchMem((iLBC_encinst_t*)&Enc_Inst, scratchBlock, &size);
WebRtcIlbcfix_DecoderAssignScratchMem((iLBC_decinst_t*)&Dec_Inst, scratchBlock, &size);
#endif
/* extract the input file and channel file */ /* extract the input file and channel file */
#ifdef SPLIT_10MS #ifdef SPLIT_10MS
@ -258,7 +252,8 @@ int main(int argc, char* argv[])
while( count < blockcount * (Enc_Inst.blockl/frameLen) ) { while( count < blockcount * (Enc_Inst.blockl/frameLen) ) {
encode(&Enc_Inst, &encodeddata[Enc_Inst.no_of_words * encode(&Enc_Inst, &encodeddata[Enc_Inst.no_of_words *
(count/(Enc_Inst.nsub/2))], &inputdata[frameLen * count] ); (count/(Enc_Inst.nsub/2))],
&inputdata[frameLen * count] );
#else #else
while (count < noOfBlocks) { while (count < noOfBlocks) {
encode( &Enc_Inst, &encodeddata[Enc_Inst.no_of_words * count], encode( &Enc_Inst, &encodeddata[Enc_Inst.no_of_words * count],