Rename MediaCodecBridge::Reset() to Flush()

media/base/android/media_decoder_job.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 "media/base/android/media_decoder_job.h"
 
 #include "base/bind.h"
 #include "base/callback_helpers.h"
 #include "base/single_thread_task_runner.h"
 #include "base/threading/thread_task_runner_handle.h"
@@ skipping 370 matching lines @@
     const MediaDecoderJob::DecoderCallback& callback) {
   DVLOG(1) << __FUNCTION__;
   DCHECK(decoder_task_runner_->BelongsToCurrentThread());
   TRACE_EVENT0("media", __FUNCTION__);
 
   if (needs_flush) {
     DVLOG(1) << "DecodeInternal needs flush.";
     input_eos_encountered_ = false;
     output_eos_encountered_ = false;
     input_buf_index_ = -1;
-    MediaCodecStatus reset_status = media_codec_bridge_->Reset();
-    if (MEDIA_CODEC_OK != reset_status) {
-      callback.Run(reset_status, false, kNoTimestamp(), kNoTimestamp());
+    MediaCodecStatus flush_status = media_codec_bridge_->Flush();
+    if (flush_status != MEDIA_CODEC_OK) {
+      callback.Run(flush_status, false, kNoTimestamp(), kNoTimestamp());
       return;
     }
   }
 
   // Once output EOS has occurred, we should not be asked to decode again.
   // MediaCodec has undefined behavior if similarly asked to decode after output
   // EOS.
   DCHECK(!output_eos_encountered_);
 
   // For aborted access unit, just skip it and inform the player.
@@ skipping 279 matching lines @@
 
 void MediaDecoderJob::ReleaseMediaCodecBridge() {
   if (!media_codec_bridge_)
     return;
 
   media_codec_bridge_.reset();
   input_buf_index_ = -1;
 }
 
 }  // namespace media