From f3f13583606dd3b31d159823fad86446f2e62cc6 Mon Sep 17 00:00:00 2001 From: "pbos@webrtc.org" <pbos@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> Date: Tue, 9 Jul 2013 14:04:46 +0000 Subject: [PATCH] Fixed implicit-int-conversion bugs. BUG= R=stefan@webrtc.org Review URL: https://webrtc-codereview.appspot.com/1776004 git-svn-id: http://webrtc.googlecode.com/svn/trunk@4313 4adac7df-926f-26a2-2b94-8c16560cd09d --- .../video_engine/test/common/file_capturer.cc | 14 ++++++++++--- webrtc/video_engine/test/full_stack.cc | 20 ++++++++++--------- 2 files changed, 22 insertions(+), 12 deletions(-) diff --git a/webrtc/video_engine/test/common/file_capturer.cc b/webrtc/video_engine/test/common/file_capturer.cc index b373c8974..fa04caad9 100644 --- a/webrtc/video_engine/test/common/file_capturer.cc +++ b/webrtc/video_engine/test/common/file_capturer.cc @@ -33,7 +33,8 @@ YuvFileFrameGenerator::YuvFileFrameGenerator(FILE* file, size_t height, Clock* clock) : FrameGenerator(width, height, clock), file_(file) { - frame_size_ = CalcBufferSize(kI420, width_, height_); + frame_size_ = CalcBufferSize( + kI420, static_cast<int>(width_), static_cast<int>(height_)); frame_buffer_ = new uint8_t[frame_size_]; } @@ -49,8 +50,15 @@ void YuvFileFrameGenerator::GenerateNextFrame() { return; } - ConvertToI420(kI420, frame_buffer_, 0, 0, width_, height_, frame_size_, - kRotateNone, &frame_); + ConvertToI420(kI420, + frame_buffer_, + 0, + 0, + static_cast<int>(width_), + static_cast<int>(height_), + 0, + kRotateNone, + &frame_); } } // namespace test } // namespace webrtc diff --git a/webrtc/video_engine/test/full_stack.cc b/webrtc/video_engine/test/full_stack.cc index 566638125..b2a37ce95 100644 --- a/webrtc/video_engine/test/full_stack.cc +++ b/webrtc/video_engine/test/full_stack.cc @@ -39,9 +39,10 @@ struct FullStackTestParams { const char* test_label; struct { const char* name; - size_t width, height, fps; + size_t width, height; + int fps; } clip; - size_t bitrate; + unsigned int bitrate; double avg_psnr_threshold; double avg_ssim_threshold; }; @@ -274,13 +275,14 @@ TEST_P(FullStackTest, NoPacketLoss) { newapi::VideoEngine::Create(newapi::VideoEngineConfig())); test::DirectTransport transport(NULL); - VideoAnalyzer analyzer(NULL, - &transport, - loopback_video.get(), - params.test_label, - params.avg_psnr_threshold, - params.avg_ssim_threshold, - FLAGS_seconds * params.clip.fps); + VideoAnalyzer analyzer( + NULL, + &transport, + loopback_video.get(), + params.test_label, + params.avg_psnr_threshold, + params.avg_ssim_threshold, + static_cast<uint64_t>(FLAGS_seconds * params.clip.fps)); scoped_ptr<newapi::VideoCall> call(video_engine->CreateCall(&analyzer)); analyzer.receiver_ = call->Receiver();