Index: webrtc/modules/audio_coding/codecs/isac/fix/test/test_iSACfixfloat.c |
diff --git a/webrtc/modules/audio_coding/codecs/isac/fix/test/test_iSACfixfloat.c b/webrtc/modules/audio_coding/codecs/isac/fix/test/test_iSACfixfloat.c |
index 9aabd04a95461400e57036a80a38469ca4a71a16..a969d7ac60313d0f5363a87b0bbc8d6ba9a92508 100644 |
--- a/webrtc/modules/audio_coding/codecs/isac/fix/test/test_iSACfixfloat.c |
+++ b/webrtc/modules/audio_coding/codecs/isac/fix/test/test_iSACfixfloat.c |
@@ -68,9 +68,9 @@ void get_arrival_time(int current_framesamples, /* samples */ |
/* everything in samples */ |
BN_data->sample_count = BN_data->sample_count + current_framesamples; |
- BN_data->arrival_time += |
- ((packet_size + HeaderSize) * 8 * FS) / (bottleneck + HeaderRate); |
- BN_data->send_time += current_framesamples; |
+ BN_data->arrival_time += (uint32_t) |
+ (((packet_size + HeaderSize) * 8 * FS) / (bottleneck + HeaderRate)); |
+ BN_data->send_time += current_framesamples; |
kwiberg-webrtc
2015/06/08 13:09:38
Tabs.
Peter Kasting
2015/06/08 20:44:29
Oops, this must have been a merge failure.
Peter Kasting
2015/06/10 01:09:54
Done.
|
if (BN_data->arrival_time < BN_data->sample_count) |
BN_data->arrival_time = BN_data->sample_count; |