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

Refactoring common_audio: Remove macro WEBRTC_SPL_MEMMOVE_W16

Browse Source 
Yet another macro that utilizes a function directly.

BUG=3348,3353
TESTED=locally on linux and trybots
R=kwiberg@webrtc.org, turaj@webrtc.org

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

git-svn-id: http://webrtc.googlecode.com/svn/trunk@6935 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
bjornv@webrtc.org
2014-08-20 10:09:34 +00:00
parent 6908b84179
commit 52275341d8
4 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
webrtc/common_audio/signal_processing/include/signal_processing_library.h
View File

@@ -117,9 +117,6 @@ extern "C" {
#define WEBRTC_SPL_MEMCPY_W16(v1, v2, length) \ #define WEBRTC_SPL_MEMCPY_W16(v1, v2, length) \
memcpy(v1, v2, (length) * sizeof(int16_t)) memcpy(v1, v2, (length) * sizeof(int16_t))
#define WEBRTC_SPL_MEMMOVE_W16(v1, v2, length) \
memmove(v1, v2, (length) * sizeof(int16_t))
// inline functions: // inline functions:
#include "webrtc/common_audio/signal_processing/include/spl_inl.h" #include "webrtc/common_audio/signal_processing/include/spl_inl.h"

6
webrtc/modules/audio_coding/codecs/ilbc/decode_residual.c
View File

@@ -16,6 +16,8 @@
******************************************************************/ ******************************************************************/
#include <string.h>
#include "defines.h" #include "defines.h"
#include "state_construct.h" #include "state_construct.h"
#include "cb_construct.h" #include "cb_construct.h"
@@ -130,7 +132,7 @@ void WebRtcIlbcfix_DecodeResidual(
); );
/* update memory */ /* update memory */
WEBRTC_SPL_MEMMOVE_W16(mem, mem+SUBL, CB_MEML-SUBL); memmove(mem, mem + SUBL, (CB_MEML - SUBL) * sizeof(*mem));
WEBRTC_SPL_MEMCPY_W16(mem+CB_MEML-SUBL, WEBRTC_SPL_MEMCPY_W16(mem+CB_MEML-SUBL,
&decresidual[(iLBC_encbits->startIdx+1+subframe)*SUBL], SUBL); &decresidual[(iLBC_encbits->startIdx+1+subframe)*SUBL], SUBL);
@@ -169,7 +171,7 @@ void WebRtcIlbcfix_DecodeResidual(
); );
/* update memory */ /* update memory */
WEBRTC_SPL_MEMMOVE_W16(mem, mem+SUBL, CB_MEML-SUBL); memmove(mem, mem + SUBL, (CB_MEML - SUBL) * sizeof(*mem));
WEBRTC_SPL_MEMCPY_W16(mem+CB_MEML-SUBL, WEBRTC_SPL_MEMCPY_W16(mem+CB_MEML-SUBL,
&reverseDecresidual[subframe*SUBL], SUBL); &reverseDecresidual[subframe*SUBL], SUBL);

7
webrtc/modules/audio_coding/codecs/ilbc/encode.c
View File

@@ -16,6 +16,8 @@
******************************************************************/ ******************************************************************/
#include <string.h>
#include "defines.h" #include "defines.h"
#include "lpc_encode.h" #include "lpc_encode.h"
#include "frame_classify.h" #include "frame_classify.h"
@@ -352,7 +354,7 @@ void WebRtcIlbcfix_EncodeImpl(
/* update memory */ /* update memory */
WEBRTC_SPL_MEMMOVE_W16(mem, mem+SUBL, (CB_MEML-SUBL)); memmove(mem, mem + SUBL, (CB_MEML - SUBL) * sizeof(*mem));
WEBRTC_SPL_MEMCPY_W16(mem+CB_MEML-SUBL, WEBRTC_SPL_MEMCPY_W16(mem+CB_MEML-SUBL,
&decresidual[(iLBCbits_inst->startIdx+1+subframe)*SUBL], SUBL); &decresidual[(iLBCbits_inst->startIdx+1+subframe)*SUBL], SUBL);
@@ -457,8 +459,7 @@ void WebRtcIlbcfix_EncodeImpl(
); );
/* update memory */ /* update memory */
memmove(mem, mem + SUBL, (CB_MEML - SUBL) * sizeof(*mem));
WEBRTC_SPL_MEMMOVE_W16(mem, mem+SUBL, (CB_MEML-SUBL));
WEBRTC_SPL_MEMCPY_W16(mem+CB_MEML-SUBL, WEBRTC_SPL_MEMCPY_W16(mem+CB_MEML-SUBL,
&reverseDecresidual[subframe*SUBL], SUBL); &reverseDecresidual[subframe*SUBL], SUBL);

11
webrtc/modules/audio_coding/codecs/ilbc/enhancer_interface.c
View File

@@ -16,6 +16,8 @@
******************************************************************/ ******************************************************************/
#include <string.h>
#include "defines.h" #include "defines.h"
#include "constants.h" #include "constants.h"
#include "xcorr_coef.h" #include "xcorr_coef.h"
@@ -71,9 +73,8 @@ int WebRtcIlbcfix_EnhancerInterface( /* (o) Estimated lag in end of in[] */
enh_period=iLBCdec_inst->enh_period; enh_period=iLBCdec_inst->enh_period;
/* Copy in the new data into the enhancer buffer */ /* Copy in the new data into the enhancer buffer */
memmove(enh_buf, &enh_buf[iLBCdec_inst->blockl],
WEBRTC_SPL_MEMMOVE_W16(enh_buf, &enh_buf[iLBCdec_inst->blockl], (ENH_BUFL - iLBCdec_inst->blockl) * sizeof(*enh_buf));
ENH_BUFL-iLBCdec_inst->blockl);
WEBRTC_SPL_MEMCPY_W16(&enh_buf[ENH_BUFL-iLBCdec_inst->blockl], in, WEBRTC_SPL_MEMCPY_W16(&enh_buf[ENH_BUFL-iLBCdec_inst->blockl], in,
iLBCdec_inst->blockl); iLBCdec_inst->blockl);
@@ -92,8 +93,8 @@ int WebRtcIlbcfix_EnhancerInterface( /* (o) Estimated lag in end of in[] */
} }
/* Update the pitch prediction for each enhancer block, move the old ones */ /* Update the pitch prediction for each enhancer block, move the old ones */
WEBRTC_SPL_MEMMOVE_W16(enh_period, &enh_period[new_blocks], memmove(enh_period, &enh_period[new_blocks],
(ENH_NBLOCKS_TOT-new_blocks)); (ENH_NBLOCKS_TOT - new_blocks) * sizeof(*enh_period));
k=WebRtcSpl_DownsampleFast( k=WebRtcSpl_DownsampleFast(
enh_buf+ENH_BUFL-inLen, /* Input samples */ enh_buf+ENH_BUFL-inLen, /* Input samples */