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

content/renderer/pepper/pepper_video_source_host.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/pepper/pepper_video_source_host.h"
 
 #include "base/bind.h"
 #include "base/numerics/safe_conversions.h"
 #include "content/public/renderer/renderer_ppapi_host.h"
 #include "content/renderer/pepper/ppb_image_data_impl.h"
@@ skipping 229 matching lines @@
                       scaled_frame_->stride(media::VideoFrame::kUPlane),
                       scaled_frame_->data(media::VideoFrame::kVPlane),
                       scaled_frame_->stride(media::VideoFrame::kVPlane),
                       dst_size.width(),
                       dst_size.height(),
                       libyuv::kFilterBilinear);
     frame = scaled_frame_;
   }
   last_frame_ = NULL;
 
-  // 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 receive frames from the effects plugin in PpFrameWriter.
-#if defined(OS_CHROMEOS)
-  auto libyuv_i420_to_xxxx = &libyuv::I420ToBGRA;
-#else
-  auto libyuv_i420_to_xxxx = &libyuv::I420ToARGB;
-#endif
-  libyuv_i420_to_xxxx(frame->visible_data(media::VideoFrame::kYPlane),
-                      frame->stride(media::VideoFrame::kYPlane),
-                      frame->visible_data(media::VideoFrame::kUPlane),
-                      frame->stride(media::VideoFrame::kUPlane),
-                      frame->visible_data(media::VideoFrame::kVPlane),
-                      frame->stride(media::VideoFrame::kVPlane),
-                      bitmap_pixels,
-                      bitmap->rowBytes(),
-                      dst_size.width(),
-                      dst_size.height());
+  libyuv::I420ToARGB(frame->visible_data(media::VideoFrame::kYPlane),
+                     frame->stride(media::VideoFrame::kYPlane),
+                     frame->visible_data(media::VideoFrame::kUPlane),
+                     frame->stride(media::VideoFrame::kUPlane),
+                     frame->visible_data(media::VideoFrame::kVPlane),
+                     frame->stride(media::VideoFrame::kVPlane),
+                     bitmap_pixels,
+                     bitmap->rowBytes(),
+                     dst_size.width(),
+                     dst_size.height());
 
   ppapi::HostResource host_resource;
   host_resource.SetHostResource(pp_instance(), shared_image_->GetReference());
 
   // Convert a video timestamp to a PP_TimeTicks (a double, in seconds).
   const PP_TimeTicks timestamp = frame->timestamp().InSecondsF();
 
   ppapi::proxy::SerializedHandle serialized_handle;
   serialized_handle.set_shmem(image_handle, byte_count);
   reply_context_.params.AppendHandle(serialized_handle);
@@ skipping 18 matching lines @@
   if (source_handler_.get() && !stream_url_.empty())
     source_handler_->Close(frame_receiver_.get());
 
   source_handler_.reset(NULL);
   stream_url_.clear();
 
   shared_image_ = NULL;
 }
 
 }  // namespace content