summaryrefslogtreecommitdiffstats
path: root/remoting
diff options
context:
space:
mode:
authorhclam@google.com <hclam@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-04-05 20:42:53 +0000
committerhclam@google.com <hclam@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-04-05 20:42:53 +0000
commit38316e10b63cd29621d6071b9eba957f329b1203 (patch)
tree1cf4a0b5313fbec2307052400030079fe68c5de4 /remoting
parent027dbf4bc5eed13b01719fb0068fbf8aa31e9a18 (diff)
downloadchromium_src-38316e10b63cd29621d6071b9eba957f329b1203.zip
chromium_src-38316e10b63cd29621d6071b9eba957f329b1203.tar.gz
chromium_src-38316e10b63cd29621d6071b9eba957f329b1203.tar.bz2
Fix build breaks
Adding statis_cast from int64 to int. TBR=ajwong BUG=None TEST=None Review URL: http://codereview.chromium.org/6798001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@80525 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting')
-rw-r--r--remoting/host/screen_recorder.cc10
1 files changed, 5 insertions, 5 deletions
diff --git a/remoting/host/screen_recorder.cc b/remoting/host/screen_recorder.cc
index 8faaf3b0..f4730c1 100644
--- a/remoting/host/screen_recorder.cc
+++ b/remoting/host/screen_recorder.cc
@@ -225,8 +225,8 @@ void ScreenRecorder::CaptureDoneCallback(
return;
TraceContext::tracer()->PrintString("Capture Done");
- int capture_time =
- (base::Time::Now() - capture_start_time_).InMilliseconds();
+ int capture_time = static_cast<int>(
+ (base::Time::Now() - capture_start_time_).InMilliseconds());
capture_data->set_capture_time_ms(capture_time);
encode_loop_->PostTask(
FROM_HERE,
@@ -379,10 +379,10 @@ void ScreenRecorder::DoStopOnEncodeThread(Task* done_task) {
void ScreenRecorder::EncodedDataAvailableCallback(VideoPacket* packet) {
DCHECK_EQ(encode_loop_, MessageLoop::current());
- bool last = packet->flags() & VideoPacket::LAST_PACKET;
+ bool last = (packet->flags() & VideoPacket::LAST_PACKET) != 0;
if (last) {
- int encode_time =
- (base::Time::Now() - encode_start_time_).InMilliseconds();
+ int encode_time = static_cast<int>(
+ (base::Time::Now() - encode_start_time_).InMilliseconds());
packet->set_encode_time_ms(encode_time);
}