Fix issue in calculateDelayAsymmetry function

- When the number of bit used for the calculation was smaller than 16, the result of the calculation was 0.

Fix issue in calculateDelayAsymmetry function
- When the number of bit used for the calculation was smaller than 16, the result of the calculation was 0.
fbf9ee41 · baujc · add5fffe · fbf9ee41
Commit fbf9ee41 authored Apr 09, 2019 by baujc
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 3 deletions

servo.c proto-standard/servo.c +9 -3

No files found.
--- a/proto-standard/servo.c
+++ b/proto-standard/servo.c
@@ -93,12 +93,18 @@ static TimeInterval calculateDelayAsymmetry(RelativeDifference scaledDelayAsymCo
 	if ( lostBits<0 )
 		lostBits=0;
 	fracBitsUsed=DELAY_ASYM_BASE_FRACTION-(lostBits>>1)-1;
-	rescaledMeanDelay = scaledMeanDelay<<(fracBitsUsed-TIME_INTERVAL_FRACBITS);
-	rescaledAsymDelayCoeff=scaledDelayAsymCoeff>>(REL_DIFF_FRACBITS-fracBitsUsed);
+	rescaledMeanDelay = (fracBitsUsed>=TIME_INTERVAL_FRACBITS) ?
+			scaledMeanDelay<<(fracBitsUsed-TIME_INTERVAL_FRACBITS) :
+			scaledMeanDelay>>(TIME_INTERVAL_FRACBITS-fracBitsUsed);
+	rescaledAsymDelayCoeff= (fracBitsUsed>=REL_DIFF_FRACBITS) ?
+			scaledDelayAsymCoeff<<(fracBitsUsed-REL_DIFF_FRACBITS) :
+			scaledDelayAsymCoeff>>(REL_DIFF_FRACBITS-fracBitsUsed);
 	delayAsym= rescaledAsymDelayCoeff*rescaledMeanDelay;
 	delayAsym+=((TimeInterval)1<<(fracBitsUsed-1));
 	delayAsym>>=fracBitsUsed;
-	delayAsym>>=(fracBitsUsed-TIME_INTERVAL_FRACBITS);
+	delayAsym= (fracBitsUsed>=TIME_INTERVAL_FRACBITS) ?
+			delayAsym>>(fracBitsUsed-TIME_INTERVAL_FRACBITS):
+			delayAsym<<(TIME_INTERVAL_FRACBITS-fracBitsUsed);
 	delayAsym+=constantAsymmetry;
 	return delayAsym;
 }