Move conversion from YUV420 to YV12 in WebMediaPlayerMs

content/renderer/media/media_stream_video_track.cc

 // Copyright 2013 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/media_stream_video_track.h"
 
 #include "content/renderer/media/media_stream_dependency_factory.h"
 #include "content/renderer/media/webrtc/webrtc_video_sink_adapter.h"
 
 namespace content {
 
-// Empty method used for keeping a reference to the original media::VideoFrame
-// in RTCVideoRenderer::OnVideoFrame if a color conversion between I420 and
-// YV12 is needed.
-static void ReleaseOriginalFrame(
-    const scoped_refptr<media::VideoFrame>& frame) {
-}
-
 //static
 blink::WebMediaStreamTrack MediaStreamVideoTrack::CreateVideoTrack(
     MediaStreamVideoSource* source,
     const blink::WebMediaConstraints& constraints,
     const MediaStreamVideoSource::ConstraintsCallback& callback,
     bool enabled,
     MediaStreamDependencyFactory* factory) {
   blink::WebMediaStreamTrack track;
   track.initialize(source->owner());
   track.setExtraData(new MediaStreamVideoTrack(source,
@@ skipping 72 matching lines @@
     (*it)->OnEnabledChanged(enabled);
   }
 }
 
 void MediaStreamVideoTrack::OnVideoFrame(
     const scoped_refptr<media::VideoFrame>& frame) {
   DCHECK(thread_checker_.CalledOnValidThread());
   if (!enabled_)
     return;
 
-  scoped_refptr<media::VideoFrame> video_frame = frame;
-  if (frame->format() == media::VideoFrame::I420) {
-    // Rendering do not support I420 but video capture use I420.
-    // The only difference between YV12 and I420 is the order of U and V plane.
-    // To solve that the I420 frame is simply wrapped in an YV12 video frame.
-    // crbug/341452.
-    video_frame = media::VideoFrame::WrapExternalYuvData(
-        media::VideoFrame::YV12,
-        frame->coded_size(),
-        frame->visible_rect(),
-        frame->natural_size(),
-        frame->stride(media::VideoFrame::kYPlane),
-        frame->stride(media::VideoFrame::kUPlane),
-        frame->stride(media::VideoFrame::kVPlane),
-        frame->data(media::VideoFrame::kYPlane),
-        frame->data(media::VideoFrame::kUPlane),
-        frame->data(media::VideoFrame::kVPlane),
-        frame->GetTimestamp(),
-        base::Bind(&ReleaseOriginalFrame, frame));
-  }
-
   for (std::vector<MediaStreamVideoSink*>::iterator it = sinks_.begin();
        it != sinks_.end(); ++it) {
-    (*it)->OnVideoFrame(video_frame);
+    (*it)->OnVideoFrame(frame);

[perkj_chrome, 2014/03/27 09:25:39]

Note that you will have to talk to the Pepper team if you do this change. They
expect YV12 to be delivered to the MediaStreamVideoSinks.

   }
 }
 
 void MediaStreamVideoTrack::OnReadyStateChanged(
     blink::WebMediaStreamSource::ReadyState state) {
   DCHECK(thread_checker_.CalledOnValidThread());
   for (std::vector<MediaStreamVideoSink*>::iterator it = sinks_.begin();
        it != sinks_.end(); ++it) {
     (*it)->OnReadyStateChanged(state);
   }
@@ skipping 32 matching lines @@
 
 void WebRtcMediaStreamVideoTrack::RemoveSink(MediaStreamVideoSink* sink) {
   DCHECK(thread_checker_.CalledOnValidThread());
   ScopedVector<WebRtcVideoSinkAdapter>::iterator it =
       std::find_if(sinks_.begin(), sinks_.end(), SinkWrapper(sink));
   DCHECK(it != sinks_.end());
   sinks_.erase(it);
 }
 
 }  // namespace content