[Ozone] Extends the lifetime of VaapiWrapper

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"
+#include "ui/ozone/public/ozone_platform.h"
+#include "ui/ozone/public/surface_factory_ozone.h"
 
 namespace {
 // Optimal format for rendering on overlay.
 const gfx::BufferFormat kOverlayRenderFormat = gfx::BufferFormat::UYVY_422;
 }  // namespace
 
 namespace ui {
 
 GbmBuffer::GbmBuffer(const scoped_refptr<GbmDevice>& gbm,
                      gbm_bo* bo,
@@ skipping 54 matching lines @@
 }
 
 void GbmPixmap::SetProcessingCallback(
     const ProcessingCallback& processing_callback) {
   processing_callback_ = processing_callback;
 }
 
 scoped_refptr<NativePixmap> GbmPixmap::GetProcessedPixmap(
     gfx::Size target_size,
     gfx::BufferFormat target_format) {
-  return processing_callback_.Run(target_size, target_format);
+  ui::OzonePlatform* platform = ui::OzonePlatform::GetInstance();
+  ui::SurfaceFactoryOzone* factory = platform->GetSurfaceFactoryOzone();
+  // Create a buffer from Ozone.
+  scoped_refptr<ui::NativePixmap> processed_pixmap =
+      factory->CreateNativePixmap(gfx::kNullAcceleratedWidget, target_size,
+                                  target_format, gfx::BufferUsage::SCANOUT);
+  if (!processed_pixmap) {
+    LOG(ERROR) << "Failed creating an Ozone NativePixmap for processing";
+    return nullptr;
+  }
+  if (!processing_callback_.Run(this, processed_pixmap.get())) {

[Pawel Osciak, 2015/12/02 04:07:07]

s/.get()//

We need to pass the scoper, not a raw pointer here.

[william.xie1, 2015/12/02 04:38:51]

Done.

+    LOG(ERROR) << "Failed processing NativePixmap";
+    return nullptr;
+  }
+  return processed_pixmap;
 }
 
 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 15 matching lines @@
 }
 
 int GbmPixmap::GetDmaBufPitch() const {
   return dma_buf_pitch_;
 }
 
 gfx::BufferFormat GbmPixmap::GetBufferFormat() const {
   return GetBufferFormatFromFourCCFormat(buffer_->GetFramebufferPixelFormat());
 }
 
+gfx::Size GbmPixmap::GetBufferSize() const {
+  return buffer_->GetSize();
+}
+
 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 target_size;
   gfx::BufferFormat target_format;
   if (plane_z_order && ShouldApplyProcessing(display_bounds, crop_rect,
                                              &target_size, &target_format)) {
     scoped_refptr<NativePixmap> processed_pixmap =
@@ skipping 38 matching lines @@
   gfx::Size pixmap_size = buffer_->GetSize();
   // If the required size is not integer-sized, round it to the next integer.
   *target_size = gfx::ToCeiledSize(
       gfx::SizeF(display_bounds.width() / crop_rect.width(),
                  display_bounds.height() / crop_rect.height()));
 
   return pixmap_size != *target_size || GetBufferFormat() != *target_format;
 }
 
 }  // namespace ui