Delete only call to cricket::VideoFrame::Copy.

content/renderer/media/webrtc/media_stream_remote_video_source.cc

 // Copyright 2014 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 "content/renderer/media/webrtc/media_stream_remote_video_source.h"
 
 #include <stdint.h>
 #include <utility>
 
 #include "base/bind.h"
@@ skipping 71 matching lines @@
   TRACE_EVENT1("webrtc", "RemoteVideoSourceDelegate::RenderFrame",
                "Ideal Render Instant", render_time.ToInternalValue());
 
   CHECK_NE(media::kNoTimestamp(), incoming_timestamp);
   if (start_timestamp_ == media::kNoTimestamp())
     start_timestamp_ = incoming_timestamp;
   const base::TimeDelta elapsed_timestamp =
       incoming_timestamp - start_timestamp_;
 
   scoped_refptr<media::VideoFrame> video_frame;
-  if (incoming_frame.video_frame_buffer()->native_handle() != NULL) {
+  scoped_refptr<webrtc::VideoFrameBuffer> buffer(
+      incoming_frame.video_frame_buffer());
+
+  if (buffer->native_handle() != NULL) {
     video_frame =
-        static_cast<media::VideoFrame*>(
-            incoming_frame.video_frame_buffer()->native_handle());
+        static_cast<media::VideoFrame*>(buffer->native_handle());
     video_frame->set_timestamp(elapsed_timestamp);
   } else {
-    const cricket::VideoFrame* frame =
-        incoming_frame.GetCopyWithRotationApplied();
-
-    gfx::Size size(frame->width(), frame->height());
+    buffer =
+        incoming_frame.GetCopyWithRotationApplied()->video_frame_buffer();

[nisse-chromium (ooo August 14), 2016/06/14 13:06:58]

This looks a bit silly. Should there be a rotate method on VideoFrameBuffer 
instead? Something like

  buffer = buffer->Rotate(incoming_frame.rotation())

+    gfx::Size size(buffer->width(), buffer->height());
 
     // Make a shallow copy. Both |frame| and |video_frame| will share a single
     // reference counted frame buffer. Const cast and hope no one will overwrite
     // the data.
     // TODO(magjed): Update media::VideoFrame to support const data so we don't
     // need to const cast here.
     video_frame = media::VideoFrame::WrapExternalYuvData(
         media::PIXEL_FORMAT_YV12, size, gfx::Rect(size), size,
-        frame->video_frame_buffer()->StrideY(),
-        frame->video_frame_buffer()->StrideU(),
-        frame->video_frame_buffer()->StrideV(),
-        const_cast<uint8_t*>(frame->video_frame_buffer()->DataY()),
-        const_cast<uint8_t*>(frame->video_frame_buffer()->DataU()),
-        const_cast<uint8_t*>(frame->video_frame_buffer()->DataV()),
+        buffer->StrideY(),
+        buffer->StrideU(),
+        buffer->StrideV(),
+        const_cast<uint8_t*>(buffer->DataY()),
+        const_cast<uint8_t*>(buffer->DataU()),
+        const_cast<uint8_t*>(buffer->DataV()),
         elapsed_timestamp);
     if (!video_frame)
       return;
     video_frame->AddDestructionObserver(
-        base::Bind(&base::DeletePointer<cricket::VideoFrame>, frame->Copy()));
+        base::Bind(
+            &base::DeletePointer<scoped_refptr<webrtc::VideoFrameBuffer>>,
+            new scoped_refptr<webrtc::VideoFrameBuffer>(buffer)));

[nisse-chromium (ooo August 14), 2016/06/14 13:06:58]

There ought to be some better way to do this, without allocating a new
placeholder object. How?

[perkj_chrome, 2016/06/14 13:59:28]

 video_frame->AddDestructionObserver(
        base::Bind(&ReleaseOriginalFrame, frame));

video_frame->AddDestuctrionObserver([buffer] {});

[nisse-chromium (ooo August 14), 2016/06/15 06:45:46]

The compiler didn't like a lambda here, but binding a DoNothing function seemed
to work. Would make some sense to add to bind_helpers.h.

   }
 
   video_frame->metadata()->SetTimeTicks(
       media::VideoFrameMetadata::REFERENCE_TIME, render_time);
 
   io_task_runner_->PostTask(
       FROM_HERE, base::Bind(&RemoteVideoSourceDelegate::DoRenderFrameOnIOThread,
                             this, video_frame));
 }
 
@@ skipping 81 matching lines @@
     case webrtc::MediaStreamTrackInterface::kEnded:
       SetReadyState(blink::WebMediaStreamSource::ReadyStateEnded);
       break;
     default:
       NOTREACHED();
       break;
   }
 }
 
 }  // namespace content