Rename MediaCodecBridge::Reset() to Flush()

media/base/android/ndk_media_codec_bridge.cc

 // Copyright 2015 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/ndk_media_codec_bridge.h"
 
 #include <media/NdkMediaError.h>
 #include <media/NdkMediaFormat.h>
 
 #include <limits>
@@ skipping 36 matching lines @@
     NOTIMPLEMENTED();
     return;
   }
 
   if (direction == MEDIA_CODEC_DECODER)
     media_codec_.reset(AMediaCodec_createDecoderByType(mime.c_str()));
   else
     media_codec_.reset(AMediaCodec_createEncoderByType(mime.c_str()));
 }
 
-MediaCodecStatus NdkMediaCodecBridge::Reset() {
-  media_status_t status = AMediaCodec_flush(media_codec_.get());
-  return TranslateMediaCodecStatus(status);
-}
-
 bool NdkMediaCodecBridge::Start() {
   return AMEDIA_OK == AMediaCodec_start(media_codec_.get());
 }
 
 void NdkMediaCodecBridge::Stop() {
   AMediaCodec_stop(media_codec_.get());
 }
 
+MediaCodecStatus NdkMediaCodecBridge::Flush() {
+  media_status_t status = AMediaCodec_flush(media_codec_.get());
+  return TranslateMediaCodecStatus(status);
+}
+
 MediaCodecStatus NdkMediaCodecBridge::GetOutputSize(gfx::Size* size) {
   AMediaFormat* format = AMediaCodec_getOutputFormat(media_codec_.get());
   int left, right, bottom, top;
   bool has_left = AMediaFormat_getInt32(format, kMediaFormatKeyCropLeft, &left);
   bool has_right =
       AMediaFormat_getInt32(format, kMediaFormatKeyCropRight, &right);
   bool has_bottom =
       AMediaFormat_getInt32(format, kMediaFormatKeyCropBottom, &bottom);
   bool has_top = AMediaFormat_getInt32(format, kMediaFormatKeyCropTop, &top);
   int width, height;
@@ skipping 163 matching lines @@
     const uint8_t** addr,
     size_t* capacity) {
   const uint8_t* src_data =
       AMediaCodec_getOutputBuffer(media_codec_.get(), index, capacity);
   *addr = src_data + offset;
   *capacity -= offset;
   return MEDIA_CODEC_OK;
 }
 
 }  // namespace media