Update a ton of audio code to use size_t more correctly and in general reduce
use of int16_t/uint16_t. This is the upshot of a recommendation by henrik.lundin and kwiberg on an original small change ( https://webrtc-codereview.appspot.com/42569004/#ps1 ) to stop using int16_t just because values could fit in it, and is similar in nature to a previous "mass change to use size_t more" ( https://webrtc-codereview.appspot.com/23129004/ ) which also needed to be split up for review but to land all at once, since, like adding "const", such changes tend to cause a lot of transitive effects. This was be reviewed and approved in pieces: https://codereview.webrtc.org/1224093003 https://codereview.webrtc.org/1224123002 https://codereview.webrtc.org/1224163002 https://codereview.webrtc.org/1225133003 https://codereview.webrtc.org/1225173002 https://codereview.webrtc.org/1227163003 https://codereview.webrtc.org/1227203003 https://codereview.webrtc.org/1227213002 https://codereview.webrtc.org/1227893002 https://codereview.webrtc.org/1228793004 https://codereview.webrtc.org/1228803003 https://codereview.webrtc.org/1228823002 https://codereview.webrtc.org/1228823003 https://codereview.webrtc.org/1228843002 https://codereview.webrtc.org/1230693002 https://codereview.webrtc.org/1231713002 The change is being landed as TBR to all the folks who reviewed the above. BUG=chromium:81439 TEST=none R=andrew@webrtc.org, pbos@webrtc.org TBR=aluebs, andrew, asapersson, henrika, hlundin, jan.skoglund, kwiberg, minyue, pbos, pthatcher Review URL: https://codereview.webrtc.org/1230503003 . Cr-Commit-Position: refs/heads/master@{#9768}
This commit is contained in:
@ -39,8 +39,9 @@ void WebRtcIlbcfix_Refiner(
|
||||
summed with earlier contributions */
|
||||
int16_t gain /* (i) Gain to use for this sequence */
|
||||
){
|
||||
int16_t estSegPosRounded,searchSegStartPos,searchSegEndPos,corrdim;
|
||||
int16_t tloc,tloc2,i,st,en,fraction;
|
||||
int16_t estSegPosRounded,searchSegStartPos,searchSegEndPos;
|
||||
size_t corrdim,i;
|
||||
int16_t tloc,tloc2,st,en,fraction;
|
||||
|
||||
int32_t maxtemp, scalefact;
|
||||
int16_t *filtStatePtr, *polyPtr;
|
||||
@ -65,13 +66,13 @@ void WebRtcIlbcfix_Refiner(
|
||||
if(searchSegEndPos+ENH_BLOCKL >= idatal) {
|
||||
searchSegEndPos=idatal-ENH_BLOCKL-1;
|
||||
}
|
||||
corrdim=searchSegEndPos-searchSegStartPos+1;
|
||||
corrdim=(size_t)(searchSegEndPos-searchSegStartPos+1);
|
||||
|
||||
/* compute upsampled correlation and find
|
||||
location of max */
|
||||
|
||||
WebRtcIlbcfix_MyCorr(corrVecTemp,idata+searchSegStartPos,
|
||||
(int16_t)(corrdim+ENH_BLOCKL-1),idata+centerStartPos,ENH_BLOCKL);
|
||||
corrdim+ENH_BLOCKL-1,idata+centerStartPos,ENH_BLOCKL);
|
||||
|
||||
/* Calculate the rescaling factor for the correlation in order to
|
||||
put the correlation in a int16_t vector instead */
|
||||
@ -110,7 +111,7 @@ void WebRtcIlbcfix_Refiner(
|
||||
/* initialize the vector to be filtered, stuff with zeros
|
||||
when data is outside idata buffer */
|
||||
if(st<0){
|
||||
WebRtcSpl_MemSetW16(vect, 0, (int16_t)(-st));
|
||||
WebRtcSpl_MemSetW16(vect, 0, (size_t)(-st));
|
||||
WEBRTC_SPL_MEMCPY_W16(&vect[-st], idata, (ENH_VECTL+st));
|
||||
}
|
||||
else{
|
||||
@ -120,7 +121,7 @@ void WebRtcIlbcfix_Refiner(
|
||||
WEBRTC_SPL_MEMCPY_W16(vect, &idata[st],
|
||||
(ENH_VECTL-(en-idatal)));
|
||||
WebRtcSpl_MemSetW16(&vect[ENH_VECTL-(en-idatal)], 0,
|
||||
(int16_t)(en-idatal));
|
||||
(size_t)(en-idatal));
|
||||
}
|
||||
else {
|
||||
WEBRTC_SPL_MEMCPY_W16(vect, &idata[st], ENH_VECTL);
|
||||
|
||||
Reference in New Issue
Block a user