Avoid using MakeExclusive, which is going to be deleted in webrtc.

remoting/protocol/webrtc_video_capturer_adapter.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "remoting/protocol/webrtc_video_capturer_adapter.h"
 
 #include <utility>
 
 #include "third_party/libyuv/include/libyuv/convert.h"
 #include "third_party/webrtc/media/engine/webrtcvideoframe.h"
@@ skipping 154 matching lines @@
     return;
 
   scoped_ptr<webrtc::DesktopFrame> owned_frame(frame);
 
   // TODO(sergeyu): Currently the adapter keeps generating frames even when
   // nothing is changing on the screen. This is necessary because the video
   // sender drops frames. Obviously this is a suboptimal. The sending code in
   // WebRTC needs to have some mechanism to notify when the bandwidth is
   // exceeded, so the capturer can adapt frame rate.
 
-  size_t width = frame->size().width();
-  size_t height = frame->size().height();
-  if (!yuv_frame_ || yuv_frame_->GetWidth() != width ||
-      yuv_frame_->GetHeight() != height) {
+  int width = frame->size().width();
+  int height = frame->size().height();
+  if (!yuv_frame_ ||
+      yuv_frame_->width() != width || yuv_frame_->height() != height) {
     if (!size_callback_.is_null())
       size_callback_.Run(frame->size());
 
-    scoped_ptr<cricket::WebRtcVideoFrame> webrtc_frame(
-        new cricket::WebRtcVideoFrame());
-    webrtc_frame->InitToEmptyBuffer(width, height, 0);
-    yuv_frame_ = std::move(webrtc_frame);
-
+    yuv_frame_ = new rtc::RefCountedObject<webrtc::I420Buffer>(width, height);
     // Set updated_region so the whole frame is converted to YUV below.
     frame->mutable_updated_region()->SetRect(
         webrtc::DesktopRect::MakeWH(width, height));
   }
 
-  // TODO(sergeyu): This will copy the buffer if it's being used. Optimize it by
-  // keeping a queue of frames.
-  CHECK(yuv_frame_->MakeExclusive());
-
-  yuv_frame_->SetTimeStamp(base::TimeTicks::Now().ToInternalValue() *
-                           base::Time::kNanosecondsPerMicrosecond);
+  if (!yuv_frame_->HasOneRef()) {
+    // Frame is still used, typically by the encoder. We have to make
+    // a copy before modifying it.
+    // TODO(sergeyu): This will copy the buffer if it's being used.
+    // Optimize it by keeping a queue of frames.
+    yuv_frame_ = yuv_frame_->Copy();
+  }
 
   for (webrtc::DesktopRegion::Iterator i(frame->updated_region()); !i.IsAtEnd();
        i.Advance()) {
     int left = i.rect().left();
     int top = i.rect().top();
     int width = i.rect().width();
     int height = i.rect().height();
 
     if (left % 2 == 1) {
       --left;
       ++width;
     }
     if (top % 2 == 1) {
       --top;
       ++height;
     }
+
+    int y_stride = yuv_frame_->stride(webrtc::kYPlane);
+    int u_stride = yuv_frame_->stride(webrtc::kUPlane);
+    int v_stride = yuv_frame_->stride(webrtc::kVPlane);
     libyuv::ARGBToI420(
         frame->data() + frame->stride() * top +
             left * webrtc::DesktopFrame::kBytesPerPixel,
         frame->stride(),
-        yuv_frame_->GetYPlane() + yuv_frame_->GetYPitch() * top + left,
-        yuv_frame_->GetYPitch(),
-        yuv_frame_->GetUPlane() + yuv_frame_->GetUPitch() * top / 2 + left / 2,
-        yuv_frame_->GetUPitch(),
-        yuv_frame_->GetVPlane() + yuv_frame_->GetVPitch() * top / 2 + left / 2,
-        yuv_frame_->GetVPitch(), width, height);
+        yuv_frame_->MutableData(webrtc::kYPlane) +
+            y_stride * top + left,

[Sergey Ulanov, 2016/03/24 18:15:19]

Please run clang-format for this change (git cl format). I think it would format
this code a bit differently.

[nisse-chromium (ooo August 14), 2016/03/30 13:15:50]

Done.

+        y_stride,
+        yuv_frame_->MutableData(webrtc::kUPlane) +
+            u_stride * top / 2 + left / 2,
+        u_stride,
+        yuv_frame_->MutableData(webrtc::kVPlane) +
+            v_stride * top / 2 + left / 2,
+        v_stride,
+        width, height);
   }
 
-  SignalVideoFrame(this, yuv_frame_.get());
+  scoped_ptr<cricket::VideoFrame> video_frame(new cricket::WebRtcVideoFrame(

[Sergey Ulanov, 2016/03/24 18:15:19]

nit: the frame can be allocated on the stack instead of the heap since it's not
passed anywhere:
 cricket::WebRtcVideoFrame video_frame(...);

[nisse-chromium (ooo August 14), 2016/03/30 13:15:50]

Done.

+      yuv_frame_,
+      (base::TimeTicks::Now() - base::TimeTicks()) /
+          base::TimeDelta::FromMicroseconds(1),
+      webrtc::kVideoRotation_0));
+
+  SignalVideoFrame(this, video_frame.get());
 }
 
 void WebrtcVideoCapturerAdapter::CaptureNextFrame() {
   DCHECK(thread_checker_.CalledOnValidThread());
 
   if (capture_pending_)
     return;
   capture_pending_ = true;
   desktop_capturer_->Capture(webrtc::DesktopRegion());
 }
 
 }  // namespace protocol
 }  // namespace remoting