Fix VideoDecoderVpx to use pixel format the consumer wants.

remoting/codec/video_decoder_vpx.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 "remoting/codec/video_decoder_vpx.h"
 
 #include <math.h>
 #include <stdint.h>
 
 #include "base/logging.h"
@@ skipping 10 matching lines @@
 #include "third_party/libvpx/source/libvpx/vpx/vp8dx.h"
 #include "third_party/libvpx/source/libvpx/vpx/vpx_decoder.h"
 }
 
 namespace remoting {
 
 namespace {
 
 void RenderRect(vpx_image_t* image,
                 webrtc::DesktopRect rect,
+                VideoDecoder::PixelFormat pixel_format,
                 webrtc::DesktopFrame* frame) {
+  auto yuv_to_rgb_function = libyuv::I420ToARGB;
+  int u_offset;
+  int v_offset;
+
   switch (image->fmt) {
     case VPX_IMG_FMT_I420: {
       // Align position of the top left corner so that its coordinates are
       // always even.
       rect = webrtc::DesktopRect::MakeLTRB(rect.left() & ~1, rect.top() & ~1,
                                            rect.right(), rect.bottom());
-      uint8_t* image_data_ptr = frame->GetFrameDataAtPos(rect.top_left());
-      int y_offset = rect.top() * image->stride[0] + rect.left();
-      int u_offset = rect.top() / 2 * image->stride[1] + rect.left() / 2;
-      int v_offset = rect.top() / 2 * image->stride[2] + rect.left() / 2;
-      libyuv::I420ToARGB(image->planes[0] + y_offset, image->stride[0],
-                         image->planes[1] + u_offset, image->stride[1],
-                         image->planes[2] + v_offset, image->stride[2],
-                         image_data_ptr, frame->stride(),
-                         rect.width(), rect.height());
+      u_offset = rect.top() / 2 * image->stride[1] + rect.left() / 2;
+      v_offset = rect.top() / 2 * image->stride[2] + rect.left() / 2;
+      yuv_to_rgb_function = (pixel_format == VideoDecoder::PixelFormat::BGRA)
+                                ? libyuv::I420ToARGB
+                                : libyuv::I420ToABGR;
       break;
     }
     // VP8 only outputs I420 frames, but VP9 can also produce I444.
     case VPX_IMG_FMT_I444: {
-      uint8_t* image_data_ptr = frame->GetFrameDataAtPos(rect.top_left());
-      int y_offset = rect.top() * image->stride[0] + rect.left();
-      int u_offset = rect.top() * image->stride[1] + rect.left();
-      int v_offset = rect.top() * image->stride[2] + rect.left();
-      libyuv::I444ToARGB(image->planes[0] + y_offset, image->stride[0],
-                         image->planes[1] + u_offset, image->stride[1],
-                         image->planes[2] + v_offset, image->stride[2],
-                         image_data_ptr, frame->stride(),
-                         rect.width(), rect.height());
+      u_offset = rect.top() * image->stride[1] + rect.left();
+      v_offset = rect.top() * image->stride[2] + rect.left();
+      yuv_to_rgb_function = (pixel_format == VideoDecoder::PixelFormat::BGRA)
+                                ? libyuv::I444ToARGB
+                                : libyuv::I444ToABGR;
       break;
     }
     default: {
       LOG(ERROR) << "Unsupported image format:" << image->fmt;
       return;
     }
   }
+
+  int y_offset = rect.top() * image->stride[0] + rect.left();
+  uint8_t* image_data_ptr = frame->GetFrameDataAtPos(rect.top_left());
+  yuv_to_rgb_function(image->planes[0] + y_offset, image->stride[0],
+                      image->planes[1] + u_offset, image->stride[1],
+                      image->planes[2] + v_offset, image->stride[2],
+                      image_data_ptr, frame->stride(), rect.width(),
+                      rect.height());
 }
 
 }  // namespace
 
 // static
 std::unique_ptr<VideoDecoderVpx> VideoDecoderVpx::CreateForVP8() {
   return base::WrapUnique(new VideoDecoderVpx(vpx_codec_vp8_dx()));
 }
 
 // static
 std::unique_ptr<VideoDecoderVpx> VideoDecoderVpx::CreateForVP9() {
   return base::WrapUnique(new VideoDecoderVpx(vpx_codec_vp9_dx()));
 }
 
 VideoDecoderVpx::~VideoDecoderVpx() {}
 
+void VideoDecoderVpx::SetPixelFormat(PixelFormat pixel_format) {
+  pixel_format_ = pixel_format;
+}
+
 bool VideoDecoderVpx::DecodePacket(const VideoPacket& packet,
                                    webrtc::DesktopFrame* frame) {
   // Pass the packet to the codec to process.
   vpx_codec_err_t ret = vpx_codec_decode(
       codec_.get(), reinterpret_cast<const uint8_t*>(packet.data().data()),
       packet.data().size(), nullptr, 0);
   if (ret != VPX_CODEC_OK) {
     const char* error = vpx_codec_error(codec_.get());
     const char* error_detail = vpx_codec_error_detail(codec_.get());
     LOG(ERROR) << "Decoding failed:" << (error ? error : "(NULL)") << "\n"
@@ skipping 15 matching lines @@
 
   // Determine which areas have been updated.
   webrtc::DesktopRegion* region = frame->mutable_updated_region();
   region->Clear();
   for (int i = 0; i < packet.dirty_rects_size(); ++i) {
     Rect proto_rect = packet.dirty_rects(i);
     webrtc::DesktopRect rect =
         webrtc::DesktopRect::MakeXYWH(proto_rect.x(), proto_rect.y(),
                                       proto_rect.width(), proto_rect.height());
     region->AddRect(rect);
-    RenderRect(image, rect, frame);
+    RenderRect(image, rect, pixel_format_, frame);
   }
 
   return true;
 }
 
 VideoDecoderVpx::VideoDecoderVpx(vpx_codec_iface_t* codec) {
   codec_.reset(new vpx_codec_ctx_t);
 
   vpx_codec_dec_cfg config;
   config.w = 0;
   config.h = 0;
   config.threads = 2;
   vpx_codec_err_t ret = vpx_codec_dec_init(codec_.get(), codec, &config, 0);
   CHECK_EQ(VPX_CODEC_OK, ret);
 }
 
 }  // namespace remoting