media: Add tracing around VPx decoding.

media/filters/vpx_video_decoder.cc

 // Copyright (c) 2012 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 "media/filters/vpx_video_decoder.h"
 
 #include <algorithm>
 #include <string>
 #include <vector>
 
 #include "base/bind.h"
 #include "base/callback_helpers.h"
 #include "base/command_line.h"
+#include "base/debug/trace_event.h"
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/single_thread_task_runner.h"
 #include "base/stl_util.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/sys_byteorder.h"
 #include "media/base/bind_to_current_loop.h"
 #include "media/base/decoder_buffer.h"
 #include "media/base/demuxer_stream.h"
 #include "media/base/limits.h"
@@ skipping 336 matching lines @@
 }
 
 bool VpxVideoDecoder::VpxDecode(const scoped_refptr<DecoderBuffer>& buffer,
                                 scoped_refptr<VideoFrame>* video_frame) {
   DCHECK(video_frame);
   DCHECK(!buffer->end_of_stream());
 
   // Pass |buffer| to libvpx.
   int64 timestamp = buffer->timestamp().InMicroseconds();
   void* user_priv = reinterpret_cast<void*>(&timestamp);
+
+  TRACE_EVENT_BEGIN1("video", "vpx_codec_decode", "timestamp", timestamp);

[DaleCurtis, 2014/12/03 19:12:16]

You can just use TRACE_EVENT_1() and scope it around this call with {} to avoid
the begin/end business. 

[Tom Finegan, 2014/12/03 19:33:09]

I thought the extra scoping was uglier. :)

Done.

   vpx_codec_err_t status = vpx_codec_decode(vpx_codec_,
                                             buffer->data(),
                                             buffer->data_size(),
                                             user_priv,
                                             0);
+  TRACE_EVENT_END1("video", "vpx_codec_decode", "timestamp", timestamp);
   if (status != VPX_CODEC_OK) {
     LOG(ERROR) << "vpx_codec_decode() failed, status=" << status;
     return false;
   }
 
   // Gets pointer to decoded data.
   vpx_codec_iter_t iter = NULL;
   const vpx_image_t* vpx_image = vpx_codec_get_frame(vpx_codec_, &iter);
   if (!vpx_image) {
     *video_frame = NULL;
     return true;
   }
 
   if (vpx_image->user_priv != reinterpret_cast<void*>(&timestamp)) {
     LOG(ERROR) << "Invalid output timestamp.";
     return false;
   }
 
   const vpx_image_t* vpx_image_alpha = NULL;
   if (vpx_codec_alpha_ && buffer->side_data_size() >= 8) {
     // Pass alpha data to libvpx.
     int64 timestamp_alpha = buffer->timestamp().InMicroseconds();
     void* user_priv_alpha = reinterpret_cast<void*>(&timestamp_alpha);
 
     // First 8 bytes of side data is side_data_id in big endian.
     const uint64 side_data_id = base::NetToHost64(
         *(reinterpret_cast<const uint64*>(buffer->side_data())));
     if (side_data_id == 1) {
+      TRACE_EVENT_BEGIN1("video", "vpx_codec_decode_alpha",

[DaleCurtis, 2014/12/03 19:12:16]

Ditto.

+                         "timestamp_alpha", timestamp_alpha);
       status = vpx_codec_decode(vpx_codec_alpha_,
                                 buffer->side_data() + 8,
                                 buffer->side_data_size() - 8,
                                 user_priv_alpha,
                                 0);
+      TRACE_EVENT_END1("video", "vpx_codec_decode_alpha",
+                       "timestamp_alpha", timestamp_alpha);
 
       if (status != VPX_CODEC_OK) {
         LOG(ERROR) << "vpx_codec_decode() failed on alpha, status=" << status;
         return false;
       }
 
       // Gets pointer to decoded data.
       vpx_codec_iter_t iter_alpha = NULL;
       vpx_image_alpha = vpx_codec_get_frame(vpx_codec_alpha_, &iter_alpha);
       if (!vpx_image_alpha) {
@@ skipping 76 matching lines @@
         vpx_image->stride[VPX_PLANE_Y], vpx_image->d_h, video_frame->get());
     return;
   }
   CopyAPlane(vpx_image_alpha->planes[VPX_PLANE_Y],
              vpx_image->stride[VPX_PLANE_Y],
              vpx_image->d_h,
              video_frame->get());
 }
 
 }  // namespace media