Prepare to convert various types to size_t.
This makes some behaviorally-invariant changes to make certain code that currently only works correctly with signed types work safely regardless of the signedness of the types in question. This is preparation for a future change that will convert a variety of types to size_t. There are also some formatting changes (e.g. converting "enum hack" usage to real consts) to make it simpler to just change "int" to "size_t" in the future to change the types of those constants. BUG=none R=andrew@webrtc.org, juberti@webrtc.org, kwiberg@webrtc.org TBR=ajm Review URL: https://codereview.webrtc.org/1174813003 Cr-Commit-Position: refs/heads/master@{#9413}
This commit is contained in:
@ -227,12 +227,9 @@ void WebRtcIlbcfix_CbSearch(
|
||||
inverseEnergy[indexNew+indexOffset], inverseEnergyShifts[indexNew+indexOffset],
|
||||
&CritMax, &shTotMax, &bestIndex, &bestGain);
|
||||
|
||||
sInd=bestIndex-(int16_t)(CB_RESRANGE>>1);
|
||||
sInd = ((CB_RESRANGE >> 1) > bestIndex) ?
|
||||
0 : (bestIndex - (CB_RESRANGE >> 1));
|
||||
eInd=sInd+CB_RESRANGE;
|
||||
if (sInd<0) {
|
||||
eInd-=sInd;
|
||||
sInd=0;
|
||||
}
|
||||
if (eInd>=range) {
|
||||
eInd=range-1;
|
||||
sInd=eInd-CB_RESRANGE;
|
||||
@ -247,9 +244,11 @@ void WebRtcIlbcfix_CbSearch(
|
||||
interpSamplesFilt, cDot,
|
||||
(int16_t)(sInd+20), (int16_t)(WEBRTC_SPL_MIN(39, (eInd+20))), scale);
|
||||
i=20;
|
||||
cDotPtr = &cDot[20 - sInd];
|
||||
} else {
|
||||
cDotPtr = cDot;
|
||||
}
|
||||
|
||||
cDotPtr=&cDot[WEBRTC_SPL_MAX(0,(20-sInd))];
|
||||
cb_vecPtr = cbvectors+lMem-20-i;
|
||||
|
||||
/* Calculate the cross correlations (main part of the filtered CB) */
|
||||
|
||||
Reference in New Issue
Block a user