From 4213633a4d9bafd308d68f0237e1515b156ab21f Mon Sep 17 00:00:00 2001 From: "pbos@webrtc.org" Date: Wed, 29 May 2013 15:13:12 +0000 Subject: [PATCH] Use int for FPS instead of size_t. BUG= TBR=stefan@webrtc.org Review URL: https://webrtc-codereview.appspot.com/1578005 git-svn-id: http://webrtc.googlecode.com/svn/trunk@4136 4adac7df-926f-26a2-2b94-8c16560cd09d --- webrtc/video_engine/test/common/flags.cc | 4 ++-- webrtc/video_engine/test/common/flags.h | 2 +- webrtc/video_engine/test/common/video_capturer.cc | 2 +- webrtc/video_engine/test/common/video_capturer.h | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/webrtc/video_engine/test/common/flags.cc b/webrtc/video_engine/test/common/flags.cc index 5ac50da20b..3a63ff775c 100644 --- a/webrtc/video_engine/test/common/flags.cc +++ b/webrtc/video_engine/test/common/flags.cc @@ -41,9 +41,9 @@ size_t Height() { } DEFINE_int32(fps, 30, "Frames per second."); -size_t Fps() { +int Fps() { assert(flags_are_init); - return static_cast(FLAGS_fps); + return static_cast(FLAGS_fps); } DEFINE_int32(min_bitrate, 50, "Minimum video bitrate."); diff --git a/webrtc/video_engine/test/common/flags.h b/webrtc/video_engine/test/common/flags.h index d652aec06b..fb5f5fc9c9 100644 --- a/webrtc/video_engine/test/common/flags.h +++ b/webrtc/video_engine/test/common/flags.h @@ -21,7 +21,7 @@ void Init(int* argc, char ***argv); size_t Width(); size_t Height(); -size_t Fps(); +int Fps(); size_t MinBitrate(); size_t StartBitrate(); size_t MaxBitrate(); diff --git a/webrtc/video_engine/test/common/video_capturer.cc b/webrtc/video_engine/test/common/video_capturer.cc index b90daaa2e1..503ea4c22e 100644 --- a/webrtc/video_engine/test/common/video_capturer.cc +++ b/webrtc/video_engine/test/common/video_capturer.cc @@ -32,7 +32,7 @@ VideoCapturer::VideoCapturer(newapi::VideoSendStreamInput* input) VideoCapturer* VideoCapturer::Create(newapi::VideoSendStreamInput* input, size_t width, size_t height, - size_t fps, + int fps, Clock* clock) { VcmCapturer* vcm_capturer = VcmCapturer::Create(input, width, height, fps); diff --git a/webrtc/video_engine/test/common/video_capturer.h b/webrtc/video_engine/test/common/video_capturer.h index 1f8f680998..0b44a63f8b 100644 --- a/webrtc/video_engine/test/common/video_capturer.h +++ b/webrtc/video_engine/test/common/video_capturer.h @@ -27,7 +27,7 @@ class VideoCapturer { static VideoCapturer* Create(newapi::VideoSendStreamInput* input, size_t width, size_t height, - size_t fps, + int fps, Clock* clock); virtual ~VideoCapturer() {}