[Ozone] Enables overlay render format setting path and by default use UYVY

ui/ozone/platform/drm/gpu/gbm_buffer.cc

 // Copyright 2014 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 "ui/ozone/platform/drm/gpu/gbm_buffer.h"
 
 #include <drm.h>
 #include <fcntl.h>
 #include <gbm.h>
 #include <xf86drm.h>
 
 #include "base/logging.h"
 #include "base/posix/eintr_wrapper.h"
 #include "base/trace_event/trace_event.h"
 #include "ui/gfx/geometry/size_conversions.h"
 #include "ui/gfx/native_pixmap_handle_ozone.h"
 #include "ui/ozone/platform/drm/common/drm_util.h"
 #include "ui/ozone/platform/drm/gpu/drm_window.h"
 #include "ui/ozone/platform/drm/gpu/gbm_device.h"
 #include "ui/ozone/platform/drm/gpu/gbm_surface_factory.h"
 #include "ui/ozone/platform/drm/gpu/gbm_surfaceless.h"
 
+// Optimal format for rendering on overlay.
+const gfx::BufferFormat kOverlayRenderFormat = gfx::BufferFormat::UYVY_422;

[Pawel Osciak, 2015/11/09 03:52:06]

Please use an anonymous namespace.

[william.xie1, 2015/11/09 04:58:01]

Done.

+
 namespace ui {
 
 GbmBuffer::GbmBuffer(const scoped_refptr<GbmDevice>& gbm,
                      gbm_bo* bo,
                      gfx::BufferUsage usage)
     : GbmBufferBase(gbm,
                     bo,
                     usage == gfx::BufferUsage::GPU_READ ||
                         usage == gfx::BufferUsage::GPU_READ_WRITE),
       usage_(usage) {}
@@ skipping 45 matching lines @@
   base::ScopedFD dma_buf(gbm_bo_get_fd(buffer->bo()));
   if (!dma_buf.is_valid()) {
     PLOG(ERROR) << "Failed to export buffer to dma_buf";
     return false;
   }
   Initialize(dma_buf.Pass(), gbm_bo_get_stride(buffer->bo()));
   buffer_ = buffer;
   return true;
 }
 
-void GbmPixmap::SetScalingCallback(const ScalingCallback& scaling_callback) {
-  scaling_callback_ = scaling_callback;
+void GbmPixmap::SetProcessingCallback(
+    const ProcessingCallback& processing_callback) {
+  processing_callback_ = processing_callback;
 }
 
-scoped_refptr<NativePixmap> GbmPixmap::GetScaledPixmap(gfx::Size new_size) {
-  return scaling_callback_.Run(new_size);
+scoped_refptr<NativePixmap> GbmPixmap::GetProcessedPixmap(
+    gfx::Size target_size,
+    gfx::BufferFormat target_format) {
+  return processing_callback_.Run(target_size, target_format);
 }
 
 gfx::NativePixmapHandle GbmPixmap::ExportHandle() {
   gfx::NativePixmapHandle handle;
 
   base::ScopedFD dmabuf_fd(HANDLE_EINTR(dup(dma_buf_.get())));
   if (!dmabuf_fd.is_valid()) {
     PLOG(ERROR) << "dup";
     return handle;
   }
@@ skipping 11 matching lines @@
 }
 
 int GbmPixmap::GetDmaBufFd() {
   return dma_buf_.get();
 }
 
 int GbmPixmap::GetDmaBufPitch() {
   return dma_buf_pitch_;
 }
 
+gfx::BufferFormat GbmPixmap::GetBufferFormat() {
+  return GetBufferFormatFromFourCCFormat(buffer_->GetFramebufferPixelFormat());
+}
+
 bool GbmPixmap::ScheduleOverlayPlane(gfx::AcceleratedWidget widget,
                                      int plane_z_order,
                                      gfx::OverlayTransform plane_transform,
                                      const gfx::Rect& display_bounds,
                                      const gfx::RectF& crop_rect) {
-  gfx::Size required_size;
-  if (plane_z_order &&
-      ShouldApplyScaling(display_bounds, crop_rect, &required_size)) {
-    scoped_refptr<NativePixmap> scaled_pixmap = GetScaledPixmap(required_size);
-    if (scaled_pixmap) {
-      return scaled_pixmap->ScheduleOverlayPlane(
+  gfx::Size target_size;
+  gfx::BufferFormat target_format;
+  if (plane_z_order && ShouldApplyProcessing(display_bounds, crop_rect,
+                                             &target_size, &target_format)) {
+    scoped_refptr<NativePixmap> processed_pixmap =
+        GetProcessedPixmap(target_size, target_format);
+    if (processed_pixmap) {
+      return processed_pixmap->ScheduleOverlayPlane(
           widget, plane_z_order, plane_transform, display_bounds, crop_rect);
     } else {
       return false;
     }
   }
 
   // TODO(reveman): Add support for imported buffers. crbug.com/541558
   if (!buffer_) {
     PLOG(ERROR) << "ScheduleOverlayPlane requires a buffer.";
     return false;
   }
 
   DCHECK(buffer_->GetUsage() == gfx::BufferUsage::GPU_READ ||
          buffer_->GetUsage() == gfx::BufferUsage::GPU_READ_WRITE);
   surface_manager_->GetSurface(widget)->QueueOverlayPlane(OverlayPlane(
       buffer_, plane_z_order, plane_transform, display_bounds, crop_rect));
   return true;
 }
 
-bool GbmPixmap::ShouldApplyScaling(const gfx::Rect& display_bounds,
-                                   const gfx::RectF& crop_rect,
-                                   gfx::Size* required_size) {
+bool GbmPixmap::ShouldApplyProcessing(const gfx::Rect& display_bounds,
+                                      const gfx::RectF& crop_rect,
+                                      gfx::Size* target_size,
+                                      gfx::BufferFormat* target_format) {
   if (crop_rect.width() == 0 || crop_rect.height() == 0) {
-    PLOG(ERROR) << "ShouldApplyScaling passed zero scaling target.";
+    PLOG(ERROR) << "ShouldApplyProcessing passed zero processing target.";
     return false;
   }
 
   if (!buffer_) {
-    PLOG(ERROR) << "ShouldApplyScaling requires a buffer.";
+    PLOG(ERROR) << "ShouldApplyProcessing requires a buffer.";
     return false;
   }
 
+  // TODO(william.xie): Figure out the optimal render format for overlay.

[Pawel Osciak, 2015/11/09 03:52:06]

Could you please submit a crbug.com for this and put the bug number here?
Thanks.

+  *target_format = kOverlayRenderFormat;
   gfx::Size pixmap_size = buffer_->GetSize();
   // If the required size is not integer-sized, round it to the next integer.
-  *required_size = gfx::ToCeiledSize(
+  *target_size = gfx::ToCeiledSize(
       gfx::SizeF(display_bounds.width() / crop_rect.width(),
                  display_bounds.height() / crop_rect.height()));
-  return pixmap_size != *required_size;
+
+  return pixmap_size != *target_size || GetBufferFormat() != *target_format;
 }
 
 }  // namespace ui