Add metadata to media::VideoFrame and plumb it through IPC/MediaStream.

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"
@@ skipping 22 matching lines @@
  protected:
   friend class base::RefCountedThreadSafe<RemoteVideoSourceDelegate>;
   ~RemoteVideoSourceDelegate() override;
 
   // Implements webrtc::VideoRendererInterface used for receiving video frames
   // from the PeerConnection video track. May be called on a libjingle internal
   // thread.
   void SetSize(int width, int height) override;
   void RenderFrame(const cricket::VideoFrame* frame) override;
 
-  void DoRenderFrameOnIOThread(scoped_refptr<media::VideoFrame> video_frame,
-                               const media::VideoCaptureFormat& format);
+  void DoRenderFrameOnIOThread(scoped_refptr<media::VideoFrame> video_frame);

[tommi (sloooow) - chröme, 2015/03/03 10:06:15]

nit: const & ?

[miu, 2015/03/03 21:31:52]

Done.

  private:
   // Bound to the render thread.
   base::ThreadChecker thread_checker_;
 
   scoped_refptr<base::MessageLoopProxy> io_message_loop_;
   // |frame_pool_| is only accessed on whatever
   // thread webrtc::VideoRendererInterface::RenderFrame is called on.
   media::VideoFramePool frame_pool_;
 
   // |frame_callback_| is accessed on the IO thread.
@@ skipping 41 matching lines @@
     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());
   }
 
-  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,
-                pixel_format);
-
   io_message_loop_->PostTask(
       FROM_HERE,
       base::Bind(&RemoteVideoSourceDelegate::DoRenderFrameOnIOThread,
-                 this, video_frame, format));
+                 this, video_frame));
 }
 
 void MediaStreamRemoteVideoSource::
 RemoteVideoSourceDelegate::DoRenderFrameOnIOThread(
-    scoped_refptr<media::VideoFrame> video_frame,
-    const media::VideoCaptureFormat& format) {
+    scoped_refptr<media::VideoFrame> video_frame) {
   DCHECK(io_message_loop_->BelongsToCurrentThread());
   TRACE_EVENT0("webrtc", "RemoteVideoSourceDelegate::DoRenderFrameOnIOThread");
   // TODO(hclam): Give the estimated capture time.
-  frame_callback_.Run(video_frame, format, base::TimeTicks());
+  frame_callback_.Run(video_frame, base::TimeTicks());
 }
 
 MediaStreamRemoteVideoSource::MediaStreamRemoteVideoSource(
     scoped_ptr<TrackObserver> observer)
     : observer_(observer.Pass()) {
   // The callback will be automatically cleared when 'observer_' goes out of
   // scope and no further callbacks will occur.
   observer_->SetCallback(base::Bind(&MediaStreamRemoteVideoSource::OnChanged,
       base::Unretained(this)));
 }
@@ skipping 53 matching lines @@
     case webrtc::MediaStreamTrackInterface::kEnded:
       SetReadyState(blink::WebMediaStreamSource::ReadyStateEnded);
       break;
     default:
       NOTREACHED();
       break;
   }
 }
 
 }  // namespace content