media/gpu/chromeos: rename OnPipelineFlushed() to ApplyResolutionChange()

OnPipelineFlushed() implied that this method would be called for all
pipeline flushed, while it is actually called only during resolution
changes, to apply the new resolution. Use a less confusing name.

BUG=978737
TEST=VDAtest --use_vd passes on Kukui.

Change-Id: I6bf93fd67bdb1316993a6df1d64284b527ba1be4
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2143423
Commit-Queue: Alexandre Courbot <acourbot@chromium.org>
Reviewed-by: Chih-Yu Huang <akahuang@chromium.org>
Cr-Commit-Position: refs/heads/master@{#758882}

media/gpu/chromeos/video_decoder_pipeline.cc

@@ -319,7 +319,7 @@ void VideoDecoderPipeline::ResetTask(base::OnceClosure closure) {
   DCHECK(!client_reset_cb_);
   DVLOGF(3);
 
-  need_notify_decoder_flushed_ = false;
+  need_apply_new_resolution = false;
   client_reset_cb_ = std::move(closure);
   decoder_->Reset(
       base::BindOnce(&VideoDecoderPipeline::OnResetDone, decoder_weak_this_));
@@ -431,7 +431,7 @@ void VideoDecoderPipeline::OnFrameConverted(scoped_refptr<VideoFrame> frame) {
 
   // After outputting a frame, flush might be completed.
   CallFlushCbIfNeeded(DecodeStatus::OK);
-  CallOnPipelineFlushedIfNeeded();
+  CallApplyResolutionChangeIfNeeded();
 }
 
 bool VideoDecoderPipeline::HasPendingFrames() const {
@@ -468,19 +468,19 @@ void VideoDecoderPipeline::CallFlushCbIfNeeded(DecodeStatus status) {
 void VideoDecoderPipeline::PrepareChangeResolution() {
   DCHECK_CALLED_ON_VALID_SEQUENCE(decoder_sequence_checker_);
   DVLOGF(3);
-  DCHECK(!need_notify_decoder_flushed_);
+  DCHECK(!need_apply_new_resolution);
 
-  need_notify_decoder_flushed_ = true;
-  CallOnPipelineFlushedIfNeeded();
+  need_apply_new_resolution = true;
+  CallApplyResolutionChangeIfNeeded();
 }
 
-void VideoDecoderPipeline::CallOnPipelineFlushedIfNeeded() {
+void VideoDecoderPipeline::CallApplyResolutionChangeIfNeeded() {
   DCHECK_CALLED_ON_VALID_SEQUENCE(decoder_sequence_checker_);
   DVLOGF(3);
 
-  if (need_notify_decoder_flushed_ && !HasPendingFrames()) {
-    need_notify_decoder_flushed_ = false;
-    decoder_->OnPipelineFlushed();
+  if (need_apply_new_resolution && !HasPendingFrames()) {
+    need_apply_new_resolution = false;
+    decoder_->ApplyResolutionChange();
   }
 }
 

media/gpu/chromeos/video_decoder_pipeline.h

@@ -59,7 +59,7 @@ class MEDIA_GPU_EXPORT DecoderInterface {
     virtual DmabufVideoFramePool* GetVideoFramePool() const = 0;
 
     // After this method is called from |decoder_|, the client needs to call
-    // DecoderInterface::OnPipelineFlushed() when all pending frames are
+    // DecoderInterface::ApplyResolutionChange() when all pending frames are
     // flushed.
     virtual void PrepareChangeResolution() = 0;
 
@@ -114,7 +114,7 @@ class MEDIA_GPU_EXPORT DecoderInterface {
   // After DecoderInterface calls |prepare_change_resolution_cb| passed
   // from the constructor, this method is called when the pipeline flushes
   // pending frames.
-  virtual void OnPipelineFlushed() = 0;
+  virtual void ApplyResolutionChange() = 0;
 
  protected:
   // Decoder task runner. All public methods of
@@ -217,8 +217,8 @@ class MEDIA_GPU_EXPORT VideoDecoderPipeline : public VideoDecoder,
   // i.e. |image_processor_| or |frame_converter_| has pending frames.
   bool HasPendingFrames() const;
 
-  // Call DecoderInterface::OnPipelineFlushed() when we need to.
-  void CallOnPipelineFlushedIfNeeded();
+  // Call DecoderInterface::ApplyResolutionChange() when we need to.
+  void CallApplyResolutionChangeIfNeeded();
 
   // Call |client_flush_cb_| with |status|.
   void CallFlushCbIfNeeded(DecodeStatus status);
@@ -271,8 +271,8 @@ class MEDIA_GPU_EXPORT VideoDecoderPipeline : public VideoDecoder,
   base::OnceClosure client_reset_cb_;
 
   // True if we need to notify |decoder_| that the pipeline is flushed via
-  // DecoderInterface::OnPipelineFlushed().
-  bool need_notify_decoder_flushed_ = false;
+  // DecoderInterface::ApplyResolutionChange().
+  bool need_apply_new_resolution = false;
 
   // True if the decoder needs bitstream conversion before decoding.
   bool needs_bitstream_conversion_ = false;

media/gpu/v4l2/v4l2_slice_video_decoder.cc

@@ -425,7 +425,7 @@ void V4L2SliceVideoDecoder::ChangeResolution(gfx::Size pic_size,
   client_->PrepareChangeResolution();
 }
 
-void V4L2SliceVideoDecoder::OnPipelineFlushed() {
+void V4L2SliceVideoDecoder::ApplyResolutionChange() {
   DCHECK_CALLED_ON_VALID_SEQUENCE(decoder_sequence_checker_);
   DVLOGF(3);
   DCHECK(continue_change_resolution_cb_);

media/gpu/v4l2/v4l2_slice_video_decoder.h

@@ -55,7 +55,7 @@ class MEDIA_GPU_EXPORT V4L2SliceVideoDecoder
                   const OutputCB& output_cb) override;
   void Reset(base::OnceClosure closure) override;
   void Decode(scoped_refptr<DecoderBuffer> buffer, DecodeCB decode_cb) override;
-  void OnPipelineFlushed() override;
+  void ApplyResolutionChange() override;
 
   // V4L2VideoDecoderBackend::Client implementation
   void OnBackendError() override;

media/gpu/vaapi/vaapi_video_decoder.cc

@@ -240,7 +240,7 @@ void VaapiVideoDecoder::HandleDecodeTask() {
     case AcceleratedVideoDecoder::kConfigChange:
       // A new set of output buffers is requested. We either didn't have any
       // output buffers yet or encountered a resolution change.
-      // After the pipeline flushes all frames, OnPipelineFlushed() will be
+      // After the pipeline flushes all frames, ApplyResolutionChange() will be
       // called and we can start changing resolution.
       DCHECK(client_);
       SetState(State::kChangingResolution);
@@ -392,7 +392,7 @@ void VaapiVideoDecoder::OutputFrameTask(scoped_refptr<VideoFrame> video_frame,
   output_cb_.Run(std::move(video_frame));
 }
 
-void VaapiVideoDecoder::OnPipelineFlushed() {
+void VaapiVideoDecoder::ApplyResolutionChange() {
   DCHECK_CALLED_ON_VALID_SEQUENCE(decoder_sequence_checker_);
   DCHECK(state_ == State::kChangingResolution ||
          state_ == State::kWaitingForInput);

media/gpu/vaapi/vaapi_video_decoder.h

@@ -54,7 +54,7 @@ class VaapiVideoDecoder : public DecoderInterface,
                   const OutputCB& output_cb) override;
   void Decode(scoped_refptr<DecoderBuffer> buffer, DecodeCB decode_cb) override;
   void Reset(base::OnceClosure reset_cb) override;
-  void OnPipelineFlushed() override;
+  void ApplyResolutionChange() override;
 
   // DecodeSurfaceHandler<VASurface> implementation.
   scoped_refptr<VASurface> CreateSurface() override;