MediaStreamRemoteVideoSource: Wrap cricket::VideoFrame instead of copying.

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 "base/bind.h"
 #include "base/callback_helpers.h"
 #include "base/location.h"
 #include "base/message_loop/message_loop_proxy.h"
 #include "base/threading/thread_checker.h"
 #include "base/trace_event/trace_event.h"
 #include "content/renderer/media/native_handle_impl.h"
 #include "content/renderer/media/webrtc/track_observer.h"
 #include "media/base/bind_to_current_loop.h"
 #include "media/base/video_frame.h"
 #include "media/base/video_frame_pool.h"
 #include "media/base/video_util.h"
 #include "third_party/libjingle/source/talk/media/base/videoframe.h"
 
+namespace {
+
+// Release |frame| when it goes out of scope.

[tommi (sloooow) - chröme, 2015/01/29 14:21:41]

nit: s/Release/Delete
(since Release usually refers to reference counting)

[magjed_chromium, 2015/01/30 12:27:44]

Done.

+void FreeCricketFrame(scoped_ptr<cricket::VideoFrame> frame) {
+}
+
+}  // namespace
+
 namespace content {
 
 // Internal class used for receiving frames from the webrtc track on a
 // libjingle thread and forward it to the IO-thread.
 class MediaStreamRemoteVideoSource::RemoteVideoSourceDelegate
     : public base::RefCountedThreadSafe<RemoteVideoSourceDelegate>,
       public webrtc::VideoRendererInterface {
  public:
   RemoteVideoSourceDelegate(
       const scoped_refptr<base::MessageLoopProxy>& io_message_loop,
@@ skipping 48 matching lines @@
       frame->GetElapsedTime() / rtc::kNumNanosecsPerMicrosec);
 
   scoped_refptr<media::VideoFrame> video_frame;
   if (frame->GetNativeHandle() != NULL) {
     NativeHandleImpl* handle =
         static_cast<NativeHandleImpl*>(frame->GetNativeHandle());
     video_frame = static_cast<media::VideoFrame*>(handle->GetHandle());
     video_frame->set_timestamp(timestamp);
   } else {
     gfx::Size size(frame->GetWidth(), frame->GetHeight());
-    video_frame = frame_pool_.CreateFrame(

[perkj_chrome, 2015/01/30 08:57:40]

frame_pool_ is not needed now. Please remove it and the header file.

[magjed_chromium, 2015/01/30 12:27:44]

Done.

-        media::VideoFrame::YV12, size, gfx::Rect(size), size, timestamp);
 
     // Non-square pixels are unsupported.
     DCHECK_EQ(frame->GetPixelWidth(), 1u);
     DCHECK_EQ(frame->GetPixelHeight(), 1u);
 
-    int y_rows = frame->GetHeight();
-    int uv_rows = frame->GetChromaHeight();
-    CopyYPlane(
-        frame->GetYPlane(), frame->GetYPitch(), y_rows, video_frame.get());
-    CopyUPlane(
-        frame->GetUPlane(), frame->GetUPitch(), uv_rows, video_frame.get());
-    CopyVPlane(
-        frame->GetVPlane(), frame->GetVPitch(), uv_rows, video_frame.get());
+    // Take a shallow copy. Both |frame| and |copied_frame| will share a single

[perkj_chrome, 2015/01/30 08:57:40]

nit Make a shallow copy... 

[magjed_chromium, 2015/01/30 12:27:44]

Done.

+    // reference counted frame buffer.
+    scoped_ptr<cricket::VideoFrame> copied_frame(frame->Copy());
+    video_frame =
+        media::VideoFrame::WrapExternalYuvData(
+            media::VideoFrame::YV12,
+            size,
+            gfx::Rect(size),
+            size,
+            copied_frame->GetYPitch(),
+            copied_frame->GetUPitch(),
+            copied_frame->GetVPitch(),
+            copied_frame->GetYPlane(),
+            copied_frame->GetUPlane(),
+            copied_frame->GetVPlane(),
+            timestamp,
+            base::Bind(&FreeCricketFrame, Passed(&copied_frame)));
   }
 
   media::VideoPixelFormat pixel_format =
       (video_frame->format() == media::VideoFrame::YV12) ?
           media::PIXEL_FORMAT_YV12 : media::PIXEL_FORMAT_TEXTURE;
 
   media::VideoCaptureFormat format(
       gfx::Size(video_frame->natural_size().width(),
                 video_frame->natural_size().height()),
                 MediaStreamVideoSource::kUnknownFrameRate,
@@ skipping 79 matching lines @@
     case webrtc::MediaStreamTrackInterface::kEnded:
       SetReadyState(blink::WebMediaStreamSource::ReadyStateEnded);
       break;
     default:
       NOTREACHED();
       break;
   }
 }
 
 }  // namespace content