commit 2f7a484c1cfea3b51e201b34865cf229fa2fcbb9
author Hirokazu Honda <hiroh@chromium.org> Tue Sep 21 01:13:28 2021
committer Chromium LUCI CQ <chromium-scoped@luci-project-accounts.iam.gserviceaccount.com> Tue Sep 21 01:13:28 2021
tree 3874e295e6c35209ca9dd21eef9649500a79ab76
parent 666e7e7bdbb69d9260cbb4d5217d95be47061ce4

media/gpu/vaapiVEA: Add a few TRACE_EVENTs

This adds a few TRACE_EVENTs to measure VA-API operations during
hardware encoding.

Bug: b:200290959
Test: meet.google.com on rammus and chrome://tracting
Change-Id: Id2c48062f96560cc22c6b539dfde681e3abf887b
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3167670
Commit-Queue: Hirokazu Honda <hiroh@chromium.org>
Reviewed-by: Miguel Casas <mcasas@chromium.org>
Cr-Commit-Position: refs/heads/main@{#923166}

media/gpu/vaapi/vaapi_video_encode_accelerator.cc

diff --git a/media/gpu/vaapi/vaapi_video_encode_accelerator.cc b/media/gpu/vaapi/vaapi_video_encode_accelerator.cc
index c05b6a3..eaf1d47 100644
--- a/media/gpu/vaapi/vaapi_video_encode_accelerator.cc
+++ b/media/gpu/vaapi/vaapi_video_encode_accelerator.cc
@@ -543,6 +543,8 @@
     std::vector<scoped_refptr<VASurface>>* reconstructed_surfaces) {
   DCHECK_CALLED_ON_VALID_SEQUENCE(encoder_sequence_checker_);
   DCHECK(native_input_mode_);
+  TRACE_EVENT0("media,gpu", "VAVEA::CreateSurfacesForGpuMemoryBuffer");
+
   if (frame.storage_type() != VideoFrame::STORAGE_GPU_MEMORY_BUFFER) {
     NOTIFY_ERROR(kPlatformFailureError,
                  "Unexpected storage: "
@@ -556,22 +558,29 @@
     return false;
   }
 
-  // Create VASurface from GpuMemory-based VideoFrame.
-  scoped_refptr<gfx::NativePixmap> pixmap = CreateNativePixmapDmaBuf(&frame);
-  if (!pixmap) {
-    NOTIFY_ERROR(kPlatformFailureError,
-                 "Failed to create NativePixmap from VideoFrame");
-    return false;
-  }
+  scoped_refptr<VASurface> source_surface;
+  {
+    TRACE_EVENT0("media,gpu", "VAVEA::ImportGpuMemoryBufferToVASurface");
 
-  scoped_refptr<VASurface> source_surface =
-      vaapi_wrapper_->CreateVASurfaceForPixmap(std::move(pixmap));
-  if (!source_surface) {
-    NOTIFY_ERROR(kPlatformFailureError, "Failed to create VASurface");
-    return false;
+    // Create VASurface from GpuMemory-based VideoFrame.
+    scoped_refptr<gfx::NativePixmap> pixmap = CreateNativePixmapDmaBuf(&frame);
+    if (!pixmap) {
+      NOTIFY_ERROR(kPlatformFailureError,
+                   "Failed to create NativePixmap from VideoFrame");
+      return false;
+    }
+
+    source_surface =
+        vaapi_wrapper_->CreateVASurfaceForPixmap(std::move(pixmap));
+    if (!source_surface) {
+      NOTIFY_ERROR(kPlatformFailureError, "Failed to create VASurface");
+      return false;
+    }
   }
 
   // Create input and reconstructed surfaces.
+  TRACE_EVENT1("media,gpu", "VAVEA::ConstructSurfaces", "the number of layers",
+               spatial_layer_resolutions.size());
   input_surfaces->reserve(spatial_layer_resolutions.size());
   reconstructed_surfaces->reserve(spatial_layer_resolutions.size());
   for (const gfx::Size& encode_size : spatial_layer_resolutions) {
@@ -616,6 +625,7 @@
   DCHECK_CALLED_ON_VALID_SEQUENCE(encoder_sequence_checker_);
   DCHECK(!native_input_mode_);
   DCHECK(frame.IsMappable());
+  TRACE_EVENT0("media,gpu", "VAVEA::CreateSurfacesForShmem");
 
   if (expected_input_coded_size_ != frame.coded_size()) {
     // In non-zero copy mode, the coded size of the incoming frame should be
@@ -770,12 +780,18 @@
   DCHECK(frame);
   DCHECK(input_surface && reconstructed_surface);
 
-  auto coded_buffer = vaapi_wrapper_->CreateVABuffer(VAEncCodedBufferType,
-                                                     output_buffer_byte_size_);
-  if (!coded_buffer) {
-    NOTIFY_ERROR(kPlatformFailureError, "Failed creating coded buffer");
-    return nullptr;
+  std::unique_ptr<ScopedVABuffer> coded_buffer;
+  {
+    TRACE_EVENT1("media,gpu", "VAVEA::CreateVABuffer", "buffer size",
+                 output_buffer_byte_size_);
+    coded_buffer = vaapi_wrapper_->CreateVABuffer(VAEncCodedBufferType,
+                                                  output_buffer_byte_size_);
+    if (!coded_buffer) {
+      NOTIFY_ERROR(kPlatformFailureError, "Failed creating coded buffer");
+      return nullptr;
+    }
   }
+
   scoped_refptr<CodecPicture> picture;
   switch (output_codec_) {
     case VideoCodec::kH264:
@@ -872,8 +888,10 @@
       }
 
       TRACE_EVENT0("media,gpu", "VAVEA::FromExecuteToReturn");
-      TRACE_EVENT0("media,gpu", "VAVEA::Execute");
-      job->Execute();
+      {
+        TRACE_EVENT0("media,gpu", "VAVEA::Execute");
+        job->Execute();
+      }
 
       submitted_encode_jobs_.push(std::move(job));
       TryToReturnBitstreamBuffer();

media/gpu/vaapi/vaapi_wrapper.cc

diff --git a/media/gpu/vaapi/vaapi_wrapper.cc b/media/gpu/vaapi/vaapi_wrapper.cc
index f703699..5ded0ea 100644
--- a/media/gpu/vaapi/vaapi_wrapper.cc
+++ b/media/gpu/vaapi/vaapi_wrapper.cc
@@ -2818,6 +2818,9 @@
   }
 #endif  // BUILDFLAG(IS_CHROMEOS_ASH)
 
+  TRACE_EVENT2("media,gpu", "VaapiWrapper::BlitSurface", "src_rect",
+               src_rect->ToString(), "dest_rect", dest_rect->ToString());
+
   VAStatus va_res =
       vaBeginPicture(va_display_, va_context_id_, va_surface_dest.id());
   VA_SUCCESS_OR_RETURN(va_res, VaapiFunctions::kVABeginPicture, false);