ppapi: Change endianness in libyuv calls, 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/debug/trace_event.h"
@@ skipping 83 matching lines @@
                << "The image could not be mapped and is unusable.";
     return;
   }
 
   const SkBitmap* bitmap = image_data->GetMappedBitmap();
   if (!bitmap) {
     LOG(ERROR) << "PpFrameWriter::PutFrame - "
                << "The image_data's mapped bitmap is NULL.";
     return;
   }
+  // We only support PP_IMAGEDATAFORMAT_BGRA_PREMUL at the moment.
+  DCHECK(image_data->format() == PP_IMAGEDATAFORMAT_BGRA_PREMUL);
   io_message_loop_->PostTaskAndReply(
       FROM_HERE,
       base::Bind(&FrameWriterDelegate::DeliverFrameOnIO, this,
                  static_cast<uint8*>(bitmap->getPixels()),
                  bitmap->rowBytes(),
                  bitmap->width(),
                  bitmap->height(),
                  time_stamp_ns),
       base::Bind(&FrameWriterDelegate::FrameDelivered, this,
                  image_data));
@@ skipping 32 matching lines @@
   // WebRtcVideoCapturerAdapter before the frame is delivered to libJingle.
   // crbug/359587.
   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);
 
-  libyuv::BGRAToI420(data,
-                     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),
-                     frame_size.width(), frame_size.height());
+  // Due to confusion about endianness, we try to determine it from the data.

[thorcarpenter, 2014/10/21 21:14:48]

I like this, but consider adding TODO and referencing bug for when we can remove
this and always do ARGBToI420. Probably m41 time frame.

[magjed_chromium, 2014/10/22 17:27:53]

Done.

+  // 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.
+  enum {
+    UNKNOWN,
+    AXXX,
+    XXXA,
+  } endian = UNKNOWN;
+
+  uint8* row_ptr = data;
+  for (int y = 0; y < height && endian == UNKNOWN; ++y) {
+    for (int x = 0; x < width; ++x) {
+      if (row_ptr[x * 4 + 0] != 255) {
+        endian = XXXA;
+        break;
+      }
+      if (row_ptr[x * 4 + 3] != 255) {
+        endian = AXXX;
+        break;
+      }
+    }
+    row_ptr += stride;
+  }
+  if (endian == UNKNOWN) {
+    LOG(WARNING) << "PpFrameWriter::FrameWriterDelegate::DeliverFrameOnIO - "
+                 << "Could not determine endianness.";
+  }
+  const auto xxxxToI420 =
+      (endian == AXXX) ? libyuv::BGRAToI420 : libyuv::ARGBToI420;
+  xxxxToI420(data,
+             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);
 
   // The local time when this frame is generated is unknown so give a null
   // value to |estimated_capture_time|.
   new_frame_callback_.Run(new_frame, format, base::TimeTicks());
 }
 
 PpFrameWriter::PpFrameWriter() {
   DVLOG(3) << "PpFrameWriter ctor";
   delegate_ = new FrameWriterDelegate(io_message_loop());
 }
@@ skipping 78 matching lines @@
   bool track_enabled = true;
 
   stream.addTrack(MediaStreamVideoTrack::CreateVideoTrack(
       writer, constraints, MediaStreamVideoSource::ConstraintsCallback(),
       track_enabled));
 
   return true;
 }
 
 }  // namespace content