| Index: webrtc/media/devices/carbonvideorenderer.cc
|
| diff --git a/webrtc/media/devices/carbonvideorenderer.cc b/webrtc/media/devices/carbonvideorenderer.cc
|
| index a1ff6306201c6b7435837450e332d17dac95468f..766904231c88f1552cb35bb4b4ccb2924fea2def 100644
|
| --- a/webrtc/media/devices/carbonvideorenderer.cc
|
| +++ b/webrtc/media/devices/carbonvideorenderer.cc
|
| @@ -106,19 +106,22 @@ bool CarbonVideoRenderer::SetSize(int width, int height) {
|
|
|
| void CarbonVideoRenderer::OnFrame(const VideoFrame& video_frame) {
|
| {
|
| - const VideoFrame* frame = video_frame->GetCopyWithRotationApplied();
|
| + const cricket::WebRtcVideoFrame frame(
|
| + webrtc::I420Buffer::Rotate(video_frame.video_frame_buffer(),
|
| + video_frame.rotation()),
|
| + webrtc::kVideoRotation_0, video_frame.timestamp_us());
|
|
|
| - if (!SetSize(frame->width(), frame->height())) {
|
| + if (!SetSize(frame.width(), frame.height())) {
|
| return false;
|
| }
|
|
|
| // Grab the image lock so we are not trashing up the image being drawn.
|
| rtc::CritScope cs(&image_crit_);
|
| - frame->ConvertToRgbBuffer(cricket::FOURCC_ABGR,
|
| - image_.get(),
|
| - static_cast<size_t>(frame->width()) *
|
| - frame->height() * 4,
|
| - frame->width() * 4);
|
| + frame.ConvertToRgbBuffer(cricket::FOURCC_ABGR,
|
| + image_.get(),
|
| + static_cast<size_t>(frame.width()) *
|
| + frame.height() * 4,
|
| + frame.width() * 4);
|
| }
|
|
|
| // Trigger a repaint event for the whole window.
|
|
|