Effects plugin: Chrome OS is ready for switching from BGRA to ARGB.

content/renderer/media/webrtc/video_destination_handler.cc

 // Copyright (c) 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/webrtc/video_destination_handler.h"
 
 #include <string>
 
 #include "base/base64.h"
 #include "base/logging.h"
@@ skipping 130 matching lines @@
   if (state() != MediaStreamVideoSource::STARTED)
     return;
 
   const base::TimeDelta timestamp = base::TimeDelta::FromMicroseconds(
       time_stamp_ns / base::Time::kNanosecondsPerMicrosecond);
 
   scoped_refptr<media::VideoFrame> new_frame =
       frame_pool_.CreateFrame(media::VideoFrame::YV12, frame_size,
                               gfx::Rect(frame_size), frame_size, timestamp);
 
-  // TODO(magjed): Chrome OS is not ready for switching from BGRA to ARGB.
-  // Remove this once http://crbug/434007 is fixed. We have a corresponding
-  // problem when we send frames to the effects plugin in PepperVideoSourceHost.
-#if defined(OS_CHROMEOS)
-  auto libyuv_xxxx_to_i420 = &libyuv::BGRAToI420;
-#else
-  auto libyuv_xxxx_to_i420 = &libyuv::ARGBToI420;
-#endif
-  libyuv_xxxx_to_i420(src_data,
-                      src_stride,
-                      new_frame->data(media::VideoFrame::kYPlane),
-                      new_frame->stride(media::VideoFrame::kYPlane),
-                      new_frame->data(media::VideoFrame::kUPlane),
-                      new_frame->stride(media::VideoFrame::kUPlane),
-                      new_frame->data(media::VideoFrame::kVPlane),
-                      new_frame->stride(media::VideoFrame::kVPlane),
-                      width,
-                      height);
+  libyuv::ARGBToI420(src_data,
+                     src_stride,
+                     new_frame->data(media::VideoFrame::kYPlane),
+                     new_frame->stride(media::VideoFrame::kYPlane),
+                     new_frame->data(media::VideoFrame::kUPlane),
+                     new_frame->stride(media::VideoFrame::kUPlane),
+                     new_frame->data(media::VideoFrame::kVPlane),
+                     new_frame->stride(media::VideoFrame::kVPlane),
+                     width,
+                     height);
 
   delegate_->DeliverFrame(new_frame);
 }
 
 // PpFrameWriterProxy is a helper class to make sure the user won't use
 // PpFrameWriter after it is released (IOW its owner - WebMediaStreamSource -
 // is released).
 class PpFrameWriterProxy : public FrameWriterInterface {
  public:
   explicit PpFrameWriterProxy(const base::WeakPtr<PpFrameWriter>& writer)
@@ skipping 56 matching lines @@
 
   stream.addTrack(MediaStreamVideoTrack::CreateVideoTrack(
       writer, constraints, MediaStreamVideoSource::ConstraintsCallback(),
       track_enabled));
 
   *frame_writer = new PpFrameWriterProxy(writer->AsWeakPtr());
   return true;
 }
 
 }  // namespace content