From 52275341d82ef7839d902971242d7ccd6f972043 Mon Sep 17 00:00:00 2001 From: "bjornv@webrtc.org" Date: Wed, 20 Aug 2014 10:09:34 +0000 Subject: [PATCH] Refactoring common_audio: Remove macro WEBRTC_SPL_MEMMOVE_W16 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 --- .../include/signal_processing_library.h | 3 --- .../audio_coding/codecs/ilbc/decode_residual.c | 6 ++++-- webrtc/modules/audio_coding/codecs/ilbc/encode.c | 7 ++++--- .../audio_coding/codecs/ilbc/enhancer_interface.c | 11 ++++++----- 4 files changed, 14 insertions(+), 13 deletions(-) diff --git a/webrtc/common_audio/signal_processing/include/signal_processing_library.h b/webrtc/common_audio/signal_processing/include/signal_processing_library.h index 294c3f77c..33a41ba21 100644 --- a/webrtc/common_audio/signal_processing/include/signal_processing_library.h +++ b/webrtc/common_audio/signal_processing/include/signal_processing_library.h @@ -117,9 +117,6 @@ extern "C" { #define WEBRTC_SPL_MEMCPY_W16(v1, v2, length) \ memcpy(v1, v2, (length) * sizeof(int16_t)) -#define WEBRTC_SPL_MEMMOVE_W16(v1, v2, length) \ - memmove(v1, v2, (length) * sizeof(int16_t)) - // inline functions: #include "webrtc/common_audio/signal_processing/include/spl_inl.h" diff --git a/webrtc/modules/audio_coding/codecs/ilbc/decode_residual.c b/webrtc/modules/audio_coding/codecs/ilbc/decode_residual.c index d70fd388c..c65856b7b 100644 --- a/webrtc/modules/audio_coding/codecs/ilbc/decode_residual.c +++ b/webrtc/modules/audio_coding/codecs/ilbc/decode_residual.c @@ -16,6 +16,8 @@ ******************************************************************/ +#include + #include "defines.h" #include "state_construct.h" #include "cb_construct.h" @@ -130,7 +132,7 @@ void WebRtcIlbcfix_DecodeResidual( ); /* 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, &decresidual[(iLBC_encbits->startIdx+1+subframe)*SUBL], SUBL); @@ -169,7 +171,7 @@ void WebRtcIlbcfix_DecodeResidual( ); /* 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, &reverseDecresidual[subframe*SUBL], SUBL); diff --git a/webrtc/modules/audio_coding/codecs/ilbc/encode.c b/webrtc/modules/audio_coding/codecs/ilbc/encode.c index 2f899a53b..318c27a49 100644 --- a/webrtc/modules/audio_coding/codecs/ilbc/encode.c +++ b/webrtc/modules/audio_coding/codecs/ilbc/encode.c @@ -16,6 +16,8 @@ ******************************************************************/ +#include + #include "defines.h" #include "lpc_encode.h" #include "frame_classify.h" @@ -352,7 +354,7 @@ void WebRtcIlbcfix_EncodeImpl( /* 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, &decresidual[(iLBCbits_inst->startIdx+1+subframe)*SUBL], SUBL); @@ -457,8 +459,7 @@ void WebRtcIlbcfix_EncodeImpl( ); /* 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, &reverseDecresidual[subframe*SUBL], SUBL); diff --git a/webrtc/modules/audio_coding/codecs/ilbc/enhancer_interface.c b/webrtc/modules/audio_coding/codecs/ilbc/enhancer_interface.c index 809f48f3d..1e978eb2b 100644 --- a/webrtc/modules/audio_coding/codecs/ilbc/enhancer_interface.c +++ b/webrtc/modules/audio_coding/codecs/ilbc/enhancer_interface.c @@ -16,6 +16,8 @@ ******************************************************************/ +#include + #include "defines.h" #include "constants.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; /* Copy in the new data into the enhancer buffer */ - - WEBRTC_SPL_MEMMOVE_W16(enh_buf, &enh_buf[iLBCdec_inst->blockl], - ENH_BUFL-iLBCdec_inst->blockl); + memmove(enh_buf, &enh_buf[iLBCdec_inst->blockl], + (ENH_BUFL - iLBCdec_inst->blockl) * sizeof(*enh_buf)); WEBRTC_SPL_MEMCPY_W16(&enh_buf[ENH_BUFL-iLBCdec_inst->blockl], in, 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 */ - WEBRTC_SPL_MEMMOVE_W16(enh_period, &enh_period[new_blocks], - (ENH_NBLOCKS_TOT-new_blocks)); + memmove(enh_period, &enh_period[new_blocks], + (ENH_NBLOCKS_TOT - new_blocks) * sizeof(*enh_period)); k=WebRtcSpl_DownsampleFast( enh_buf+ENH_BUFL-inLen, /* Input samples */