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

content/common/gpu/media/vaapi_wrapper.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 "content/common/gpu/media/vaapi_wrapper.h"
 
 #include <dlfcn.h>
 
 #include "base/bind.h"
 #include "base/callback_helpers.h"
@@ skipping 921 matching lines @@
 
   va_res = vaDestroyBuffer(va_display_, buffer_id);
   VA_LOG_ON_ERROR(va_res, "vaDestroyBuffer failed");
 
   const auto was_found = coded_buffers_.erase(buffer_id);
   DCHECK(was_found);
 
   return buffer_segment == NULL;
 }
 
-bool VaapiWrapper::BlitSurface(VASurfaceID va_surface_id_src,
-                               const gfx::Size& src_size,
-                               VASurfaceID va_surface_id_dest,
-                               const gfx::Size& dest_size) {
+bool VaapiWrapper::BlitSurface(
+    const scoped_refptr<VASurface>& va_surface_src,

[kalyank, 2015/10/21 19:48:41]

These changes seem unrelated, can you separate them to another CL?

[william.xie1, 2015/10/22 07:35:41]

Done.

+    const scoped_refptr<VASurface>& va_surface_dest) {
   base::AutoLock auto_lock(*va_lock_);
 
   // Initialize the post processing engine if not already done.
   if (va_vpp_buffer_id_ == VA_INVALID_ID) {
     if (!InitializeVpp_Locked())
       return false;
   }
 
   VAProcPipelineParameterBuffer* pipeline_param;
   VA_SUCCESS_OR_RETURN(vaMapBuffer(va_display_, va_vpp_buffer_id_,
                                    reinterpret_cast<void**>(&pipeline_param)),
                        "Couldn't map vpp buffer", false);
 
   memset(pipeline_param, 0, sizeof *pipeline_param);
+  const gfx::Size src_size = va_surface_src->size();
+  const gfx::Size dest_size = va_surface_dest->size();
 
   VARectangle input_region;
   input_region.x = input_region.y = 0;
   input_region.width = src_size.width();
   input_region.height = src_size.height();
   pipeline_param->surface_region = &input_region;
-  pipeline_param->surface = va_surface_id_src;
+  pipeline_param->surface = va_surface_src->id();
   pipeline_param->surface_color_standard = VAProcColorStandardNone;
 
   VARectangle output_region;
   output_region.x = output_region.y = 0;
   output_region.width = dest_size.width();
   output_region.height = dest_size.height();
   pipeline_param->output_region = &output_region;
   pipeline_param->output_background_color = 0xff000000;
-  pipeline_param->output_color_standard = VAProcColorStandardNone;
+  pipeline_param->surface_color_standard = VAProcColorStandardNone;
 
   VA_SUCCESS_OR_RETURN(vaUnmapBuffer(va_display_, va_vpp_buffer_id_),
                        "Couldn't unmap vpp buffer", false);
 
   VA_SUCCESS_OR_RETURN(
-      vaBeginPicture(va_display_, va_vpp_context_id_, va_surface_id_dest),
+      vaBeginPicture(va_display_, va_vpp_context_id_, va_surface_dest->id()),
       "Couldn't begin picture", false);
 
   VA_SUCCESS_OR_RETURN(
       vaRenderPicture(va_display_, va_vpp_context_id_, &va_vpp_buffer_id_, 1),
       "Couldn't render picture", false);
 
   VA_SUCCESS_OR_RETURN(vaEndPicture(va_display_, va_vpp_context_id_),
                        "Couldn't end picture", false);
 
   return true;
@@ skipping 157 matching lines @@
   drm_fd_.reset(HANDLE_EINTR(dup(fd)));
 }
 #endif  // USE_OZONE
 
 bool VaapiWrapper::VADisplayState::VAAPIVersionLessThan(int major, int minor) {
   return (major_version_ < major) ||
       (major_version_ == major && minor_version_ < minor);
 }
 
 }  // namespace content