PepperVideoSourceHost: Change endianness of color format of frames sent to the plugin

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/debug/trace_event.h"
@@ skipping 55 matching lines @@
 
 void PpFrameWriter::FrameWriterDelegate::DeliverFrameOnIO(
      const scoped_refptr<media::VideoFrame>& frame,
      const media::VideoCaptureFormat& format) {
   DCHECK(io_message_loop_->BelongsToCurrentThread());
   // The local time when this frame is generated is unknown so give a null
   // value to |estimated_capture_time|.
   new_frame_callback_.Run(frame, format, base::TimeTicks());
 }
 
-PpFrameWriter::PpFrameWriter() : endian_(UNKNOWN) {
+PpFrameWriter::PpFrameWriter() {
   DVLOG(3) << "PpFrameWriter ctor";
 }
 
 PpFrameWriter::~PpFrameWriter() {
   DVLOG(3) << "PpFrameWriter dtor";
 }
 
 void PpFrameWriter::GetCurrentSupportedFormats(
     int max_requested_width,
     int max_requested_height,
@@ skipping 63 matching lines @@
       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);
   media::VideoCaptureFormat format(
       frame_size,
       MediaStreamVideoSource::kUnknownFrameRate,
       media::PIXEL_FORMAT_YV12);
 
-  // TODO(magjed): Remove this and always use libyuv::ARGBToI420 when
-  // crbug/426020 is fixed.
-  // Due to a change in endianness, we try to determine it from the data.
-  // The alpha channel is always 255. It is unlikely for other color channels to
-  // be 255, so we will most likely break on the first few pixels in the first
-  // frame.
-  const uint8* row_ptr = src_data;
-  // Note that we only do this if endian_ is still UNKNOWN.
-  for (int y = 0; y < height && endian_ == UNKNOWN; ++y) {
-    for (int x = 0; x < width; ++x) {
-      if (row_ptr[x * 4 + 0] != 255) {  // First byte is not Alpha => XXXA.
-        endian_ = XXXA;
-        break;
-      }
-      if (row_ptr[x * 4 + 3] != 255) {  // Fourth byte is not Alpha => AXXX.
-        endian_ = AXXX;
-        break;
-      }
-    }
-    row_ptr += src_stride;
-  }
-  if (endian_ == UNKNOWN) {
-    LOG(WARNING) << "PpFrameWriter::FrameWriterDelegate::DeliverFrameOnIO - "
-                 << "Could not determine endianness.";
-  }
-  // libyuv specifies fourcc/channel ordering the same as webrtc. That is why
-  // the naming is reversed compared to PixelEndian and PP_ImageDataFormat which
-  // describes the memory layout from the lowest address to the highest.
-  auto xxxxToI420 =
-      (endian_ == AXXX) ? &libyuv::BGRAToI420 : &libyuv::ARGBToI420;
-  xxxxToI420(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, format);
 }
 
 // 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