From 46db413e228e074ef536d76e637b7773b1450ee7 Mon Sep 17 00:00:00 2001
From: "solenberg@webrtc.org"
 <solenberg@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d>
Date: Wed, 22 May 2013 20:53:42 +0000
Subject: [PATCH] Fix failing tests on 32 bit Linux.

BUG=
R=andrew@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/1534004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@4088 4adac7df-926f-26a2-2b94-8c16560cd09d
---
 .../remote_bitrate_estimator_unittest_helper.cc            | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_unittest_helper.cc b/webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_unittest_helper.cc
index 1c1d597ed..ed1afaf08 100644
--- a/webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_unittest_helper.cc
+++ b/webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_unittest_helper.cc
@@ -75,11 +75,12 @@ RtpStream::RtcpPacket* RtpStream::Rtcp(int64_t time_now_us) {
     return NULL;
   }
   RtcpPacket* rtcp = new RtcpPacket;
-  int64_t send_time_us = RtpStream::kSendSideOffsetUs + time_now_us;
+  int64_t send_time_us = time_now_us + kSendSideOffsetUs;
   rtcp->timestamp = rtp_timestamp_offset_ + static_cast<uint32_t>(
-          ((frequency_ / 1000) * send_time_us + 500) / 1000);
+      ((frequency_ / 1000) * send_time_us + 500) / 1000);
   rtcp->ntp_secs = send_time_us / 1000000;
-  rtcp->ntp_frac = (send_time_us % 1000000) * kNtpFracPerMs;
+  rtcp->ntp_frac = static_cast<int64_t>((send_time_us % 1000000) *
+      kNtpFracPerMs);
   rtcp->ssrc = ssrc_;
   next_rtcp_time_ = time_now_us + kRtcpIntervalUs;
   return rtcp;