Rename MediaCodecBridge::Reset() to Flush()

media/gpu/android_video_decode_accelerator.cc

 // Copyright (c) 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/gpu/android_video_decode_accelerator.h"
 
 #include <stddef.h>
 
 #include <memory>
 
@@ skipping 1201 matching lines @@
   }
 
   // We might increment error_sequence_token here to cancel any delayed errors,
   // but right now it's unclear that it's safe to do so.  If we are in an error
   // state because of a codec error, then it would be okay.  Otherwise, it's
   // less obvious that we are exiting the error state.  Since deferred errors
   // are only intended for fullscreen transitions right now, we take the more
   // conservative approach and let the errors post.
   // TODO(liberato): revisit this once we sort out the error state a bit more.
 
-  // When codec is not in error state we can quickly reset (internally calls
-  // flush()) for JB-MR2 and beyond. Prior to JB-MR2, flush() had several bugs
-  // (b/8125974, b/8347958) so we must delete the MediaCodec and create a new
-  // one. The full reconfigure is much slower and may cause visible freezing if
-  // done mid-stream.
+  // When the codec is not in error state we can flush() for JB-MR2 and beyond.
+  // Prior to JB-MR2, flush() had several bugs (b/8125974, b/8347958) so we must
+  // delete the MediaCodec and create a new one. The full reconfigure is much
+  // slower and may cause visible freezing if done mid-stream.
   if (!did_codec_error_happen &&
       base::android::BuildInfo::GetInstance()->sdk_int() >= 18) {
-    DVLOG(3) << __FUNCTION__ << " Doing fast MediaCodec reset (flush).";
-    media_codec_->Reset();
+    DVLOG(3) << __FUNCTION__ << " Flushing MediaCodec.";
+    media_codec_->Flush();
     // Since we just flushed all the output buffers, make sure that nothing is
     // using them.
     strategy_->CodecChanged(media_codec_.get());
   } else {
     DVLOG(3) << __FUNCTION__
              << " Deleting the MediaCodec and creating a new one.";
     g_avda_timer.Pointer()->StopTimer(this);
-    // Changing the codec will also notify the strategy to forget about any
-    // output buffers it has currently.
     ConfigureMediaCodecAsynchronously();
   }
 }
 
 void AndroidVideoDecodeAccelerator::Reset() {
   DVLOG(1) << __FUNCTION__;
   DCHECK(thread_checker_.CalledOnValidThread());
   TRACE_EVENT0("media", "AVDA::Reset");
 
   while (!pending_bitstream_records_.empty()) {
@@ skipping 375 matching lines @@
     if (media::MediaCodecUtil::IsSurfaceViewOutputSupported()) {
       capabilities.flags |= media::VideoDecodeAccelerator::Capabilities::
           SUPPORTS_EXTERNAL_OUTPUT_SURFACE;
     }
   }
 
   return capabilities;
 }
 
 }  // namespace media