Reland r212023 "Rename VideoDecoder::ReadCB to VideoDecoder::DecodeCB."

media/base/video_decoder.h

 // Copyright (c) 2012 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_VIDEO_DECODER_H_
 #define MEDIA_BASE_VIDEO_DECODER_H_
 
 #include "base/callback.h"
 #include "base/memory/ref_counted.h"
 #include "media/base/media_export.h"
@@ skipping 37 matching lines @@
   //
   // Implementations guarantee that the callback will not be called from within
   // this method.
   //
   // If the returned status is kOk:
   // - Non-EOS (end of stream) frame contains decoded video data.
   // - EOS frame indicates the end of the stream.
   // - NULL frame indicates an aborted decode. This can happen if Reset() or
   //   Stop() is called during the decoding process.
   // Otherwise the returned frame must be NULL.
-  //
-  // TODO(xhwang): Rename this to DecodeCB.
-  typedef base::Callback<void(Status, const scoped_refptr<VideoFrame>&)> ReadCB;
+  typedef base::Callback<void(Status,
+                              const scoped_refptr<VideoFrame>&)> DecodeCB;
   virtual void Decode(const scoped_refptr<DecoderBuffer>& buffer,
-                      const ReadCB& read_cb) = 0;
+                      const DecodeCB& decode_cb) = 0;
 
-  // Resets decoder state, fulfilling all pending ReadCB and dropping extra
+  // Resets decoder state, fulfilling all pending DecodeCB and dropping extra
   // queued decoded data. After this call, the decoder is back to an initialized
   // clean state.
   // Note: No VideoDecoder calls should be made before |closure| is executed.
   virtual void Reset(const base::Closure& closure) = 0;
 
   // Stops decoder, fires any pending callbacks and sets the decoder to an
   // uninitialized state. A VideoDecoder cannot be re-initialized after it has
   // been stopped.
   // Note that if Initialize() has been called, Stop() must be called and
   // complete before deleting the decoder.
@@ skipping 13 matching lines @@
   // use a fixed set of VideoFrames for decoding.
   virtual bool CanReadWithoutStalling() const;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(VideoDecoder);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_BASE_VIDEO_DECODER_H_