Chromium Code Reviews| Index: content/renderer/media/canvas_capture_handler.cc |
| diff --git a/content/renderer/media/canvas_capture_handler.cc b/content/renderer/media/canvas_capture_handler.cc |
| index e289fd46dcec3610394a2e3f6dc2b627d18eb257..df56d2c003a698db31ab9b816250e7e7a499f6eb 100644 |
| --- a/content/renderer/media/canvas_capture_handler.cc |
| +++ b/content/renderer/media/canvas_capture_handler.cc |
| @@ -17,6 +17,7 @@ |
| #include "content/renderer/media/media_stream_video_track.h" |
| #include "content/renderer/media/webrtc_uma_histograms.h" |
| #include "content/renderer/render_thread_impl.h" |
| +#include "media/base/limits.h" |
| #include "third_party/WebKit/public/platform/WebMediaStreamSource.h" |
| #include "third_party/WebKit/public/platform/WebString.h" |
| #include "third_party/libyuv/include/libyuv.h" |
| @@ -38,10 +39,11 @@ namespace content { |
| // This class is single threaded and pinned to main render thread. |
| class VideoCapturerSource : public media::VideoCapturerSource { |
| public: |
| - explicit VideoCapturerSource(base::WeakPtr<CanvasCaptureHandler> |
| - canvas_handler, |
| - double frame_rate) |
| - : frame_rate_(frame_rate), |
| + VideoCapturerSource(base::WeakPtr<CanvasCaptureHandler> canvas_handler, |
| + double frame_rate) |
| + : frame_rate_(static_cast<float>( |
|
mcasas
2016/12/20 22:57:14
Why not keep |frame_rate_| as double and avoid
thi
emircan
2016/12/20 23:07:38
media::VideoCaptureFormat() in l.59-61 expect the
|
| + std::min(static_cast<double>(media::limits::kMaxFramesPerSecond), |
| + frame_rate))), |
| canvas_handler_(canvas_handler) {} |
| protected: |
| @@ -79,7 +81,7 @@ class VideoCapturerSource : public media::VideoCapturerSource { |
| } |
| private: |
| - const double frame_rate_; |
| + const float frame_rate_; |
| // Bound to Main Render thread. |
| base::ThreadChecker main_render_thread_checker_; |
| // CanvasCaptureHandler is owned by CanvasDrawListener in blink and might be |