| Index: webrtc/media/devices/carbonvideorenderer.cc
|
| diff --git a/webrtc/media/devices/carbonvideorenderer.cc b/webrtc/media/devices/carbonvideorenderer.cc
|
| index f753ca8db5b79a80790d106db9f9384dd70feef8..a1ff6306201c6b7435837450e332d17dac95468f 100644
|
| --- a/webrtc/media/devices/carbonvideorenderer.cc
|
| +++ b/webrtc/media/devices/carbonvideorenderer.cc
|
| @@ -108,7 +108,7 @@ void CarbonVideoRenderer::OnFrame(const VideoFrame& video_frame) {
|
| {
|
| const VideoFrame* frame = video_frame->GetCopyWithRotationApplied();
|
|
|
| - if (!SetSize(frame->GetWidth(), frame->GetHeight(), 0)) {
|
| + if (!SetSize(frame->width(), frame->height())) {
|
| return false;
|
| }
|
|
|
| @@ -116,8 +116,9 @@ void CarbonVideoRenderer::OnFrame(const VideoFrame& video_frame) {
|
| rtc::CritScope cs(&image_crit_);
|
| frame->ConvertToRgbBuffer(cricket::FOURCC_ABGR,
|
| image_.get(),
|
| - frame->GetWidth() * frame->GetHeight() * 4,
|
| - frame->GetWidth() * 4);
|
| + static_cast<size_t>(frame->width()) *
|
| + frame->height() * 4,
|
| + frame->width() * 4);
|
| }
|
|
|
| // Trigger a repaint event for the whole window.
|
|
|