Rename MediaCodecBridge::Reset() to Flush()

media/base/android/media_codec_bridge.h

 // 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.
 
 #ifndef MEDIA_BASE_ANDROID_MEDIA_CODEC_BRIDGE_H_
 #define MEDIA_BASE_ANDROID_MEDIA_CODEC_BRIDGE_H_
 
 #include <stddef.h>
 #include <stdint.h>
 
@@ skipping 28 matching lines @@
 };
 
 // Interface for wrapping different Android MediaCodec implementations. For
 // more information on Android MediaCodec, check
 // http://developer.android.com/reference/android/media/MediaCodec.html
 // Note: MediaCodec is only available on JB and greater.
 class MEDIA_EXPORT MediaCodecBridge {
  public:
   virtual ~MediaCodecBridge();
 
-  // Resets both input and output, all indices previously returned in calls to
-  // DequeueInputBuffer() and DequeueOutputBuffer() become invalid.
-  // Please note that this clears all the inputs in the media codec. In other
-  // words, there will be no outputs until new input is provided.
-  // Returns MEDIA_CODEC_ERROR if an unexpected error happens, or MEDIA_CODEC_OK
-  // otherwise.
-  virtual MediaCodecStatus Reset() = 0;
-
   // Calls start() against the media codec instance. Returns whether media
   // codec was successfully started.
   virtual bool Start() = 0;
 
   // Finishes the decode/encode session. The instance remains active
   // and ready to be StartAudio/Video()ed again. HOWEVER, due to the buggy
   // vendor's implementation , b/8125974, Stop() -> StartAudio/Video() may not
   // work on some devices. For reliability, Stop() -> delete and recreate new
   // instance -> StartAudio/Video() is recommended.
   virtual void Stop() = 0;
 
+  // Calls flush() on the MediaCodec. All indices previously returned in calls
+  // to DequeueInputBuffer() and DequeueOutputBuffer() become invalid. Please
+  // note that this clears all the inputs in the media codec. In other words,
+  // there will be no outputs until new input is provided. Returns
+  // MEDIA_CODEC_ERROR if an unexpected error happens, or MEDIA_CODEC_OK
+  // otherwise.
+  virtual MediaCodecStatus Flush() = 0;
+
   // Used for getting the output size. This is valid after DequeueInputBuffer()
   // returns a format change by returning INFO_OUTPUT_FORMAT_CHANGED.
   // Returns MEDIA_CODEC_ERROR if an error occurs, or MEDIA_CODEC_OK otherwise.
   virtual MediaCodecStatus GetOutputSize(gfx::Size* size) = 0;
 
   // Used for checking for new sampling rate after DequeueInputBuffer() returns
   // INFO_OUTPUT_FORMAT_CHANGED
   // Returns MEDIA_CODEC_ERROR if an error occurs, or MEDIA_CODEC_OK otherwise.
   virtual MediaCodecStatus GetOutputSamplingRate(int* sampling_rate) = 0;
 
@@ skipping 104 matching lines @@
   bool FillInputBuffer(int index,
                        const uint8_t* data,
                        size_t data_size) WARN_UNUSED_RESULT;
 
   DISALLOW_COPY_AND_ASSIGN(MediaCodecBridge);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_BASE_ANDROID_MEDIA_CODEC_BRIDGE_H_