Vaapi: remove debug var |num_frames_at_client_|

This CL removes the debug variable |num_frames_at_client_| since it's
always equal to the difference between pictures_.size() and
available_picture_buffers_.size().

Test: Checked in crosvideo and v_d_a_unittests that the values are ==.
Bug: 721674
Change-Id: I946192bde8368210c4b65cf0084c34ee86ea3e62
Reviewed-on: https://chromium-review.googlesource.com/c/1357554Reviewed-by: Hirokazu Honda <hiroh@chromium.org>
Commit-Queue: Miguel Casas <mcasas@chromium.org>
Cr-Commit-Position: refs/heads/master@{#613089}

media/gpu/vaapi/vaapi_video_decode_accelerator.cc

@@ -162,7 +162,6 @@ VaapiVideoDecodeAccelerator::VaapiVideoDecodeAccelerator(
       decode_using_client_picture_buffers_(false),
       task_runner_(base::ThreadTaskRunnerHandle::Get()),
       decoder_thread_("VaapiDecoderThread"),
-      num_frames_at_client_(0),
       finish_flush_pending_(false),
       awaiting_va_surfaces_recycle_(false),
       requested_num_pics_(0),
@@ -273,19 +272,21 @@ void VaapiVideoDecodeAccelerator::OutputPicture(
                                  "Failed putting surface into pixmap",
                                  PLATFORM_FAILURE, );
   }
-  // Notify the client a picture is ready to be displayed.
-  ++num_frames_at_client_;
+
   TRACE_COUNTER_ID2("media,gpu", "Vaapi frames at client", this, "used",
-                    num_frames_at_client_, "available",
-                    pictures_.size() - num_frames_at_client_);
+                    pictures_.size() - available_picture_buffers_.size(),
+                    "available", available_picture_buffers_.size());
+
   DVLOGF(4) << "Notifying output picture id " << output_id << " for input "
             << input_id
             << " is ready. visible rect: " << visible_rect.ToString();
-  if (client_) {
-    client_->PictureReady(Picture(output_id, input_id, visible_rect,
-                                  picture_color_space.ToGfxColorSpace(),
-                                  picture->AllowOverlay()));
-  }
+  if (!client_)
+    return;
+
+  // Notify the |client_| a picture is ready to be consumed.
+  client_->PictureReady(Picture(output_id, input_id, visible_rect,
+                                picture_color_space.ToGfxColorSpace(),
+                                picture->AllowOverlay()));
 }
 
 void VaapiVideoDecodeAccelerator::TryOutputPicture() {
@@ -540,7 +541,6 @@ void VaapiVideoDecodeAccelerator::TryFinishSurfaceSetChange() {
       client_->DismissPictureBuffer(iter->first);
   }
   pictures_.clear();
-  num_frames_at_client_ = 0;
 
   // And ask for a new set as requested.
   VLOGF(2) << "Requesting " << requested_num_pics_
@@ -653,8 +653,7 @@ void VaapiVideoDecodeAccelerator::AssignPictureBuffers(
   }
   DCHECK_EQ(va_surface_ids.size(), buffers.size());
 
-  for (const auto id : va_surface_ids)
-    available_va_surfaces_.push_back(id);
+  available_va_surfaces_.assign(va_surface_ids.begin(), va_surface_ids.end());
 
   // Resume DecodeTask if it is still in decoding state.
   if (state_ == kDecoding) {
@@ -723,14 +722,15 @@ void VaapiVideoDecodeAccelerator::ReusePictureBuffer(
     return;
   }
 
-  --num_frames_at_client_;
-  TRACE_COUNTER_ID2("media,gpu", "Vaapi frames at client", this, "used",
-                    num_frames_at_client_, "available",
-                    pictures_.size() - num_frames_at_client_);
   {
     base::AutoLock auto_lock(lock_);
     available_picture_buffers_.push_back(picture_buffer_id);
   }
+
+  TRACE_COUNTER_ID2("media,gpu", "Vaapi frames at client", this, "used",
+                    pictures_.size() - available_picture_buffers_.size(),
+                    "available", available_picture_buffers_.size());
+
   TryOutputPicture();
 }
 

media/gpu/vaapi/vaapi_video_decode_accelerator.h

@@ -206,10 +206,6 @@ class MEDIA_GPU_EXPORT VaapiVideoDecodeAccelerator
   // Current input buffer at decoder.
   std::unique_ptr<InputBuffer> curr_input_buffer_;
 
-  // List of PictureBuffer ids available to be sent to |client_| via
-  // OutputPicture() (|client_| returns them via ReusePictureBuffer()).
-  std::list<int32_t> available_picture_buffers_;
-
   std::unique_ptr<VaapiPictureFactory> vaapi_picture_factory_;
 
   // Constructed in Initialize() when the codec information is received.
@@ -221,6 +217,9 @@ class MEDIA_GPU_EXPORT VaapiVideoDecodeAccelerator
   // TryFinishSurfaceSetChange(). Comes after |vaapi_wrapper_| to ensure all
   // pictures are destroyed before this is destroyed.
   base::small_map<std::map<int32_t, std::unique_ptr<VaapiPicture>>> pictures_;
+  // List of PictureBuffer ids available to be sent to |client_| via
+  // OutputPicture() (|client_| returns them via ReusePictureBuffer()).
+  std::list<int32_t> available_picture_buffers_;
 
   // VASurfaceIDs no longer in use that can be passed back to |decoder_| for
   // reuse, once it requests them.
@@ -267,8 +266,6 @@ class MEDIA_GPU_EXPORT VaapiVideoDecodeAccelerator
   // |decoder_thread_.Stop()| returns.
   scoped_refptr<base::SingleThreadTaskRunner> decoder_thread_task_runner_;
 
-  int num_frames_at_client_;
-
   // Whether we are waiting for any pending_output_cbs_ to be run before
   // NotifyingFlushDone.
   bool finish_flush_pending_;