Rename StatisticsCallback to StatisticsCB and DataSource::ReadCallback to ReadCB.

To comply with naming convention in media code. Renaming only, no other changes.

In rtc_video_decoder.cc, explicitly use media::VideoFrame so not to confuse with cricket::VideoFrame.

BUG=none
TEST=none

Review URL: http://codereview.chromium.org/9634012

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@125959 0039d316-1c4b-4281-b951-d872f2087c98

7 files changed, 25 insertions, 25 deletions

diff --git a/media/base/audio_decoder.h b/media/base/audio_decoder.h
index 4c662e7..3b41694 100644
--- a/media/base/audio_decoder.h
+++ b/media/base/audio_decoder.h
@@ -21,10 +21,10 @@ class MEDIA_EXPORT AudioDecoder
  public:
   // Initialize an AudioDecoder with the given DemuxerStream, executing the
   // callback upon completion.
-  // stats_callback is used to update global pipeline statistics.
+  // statistics_cb is used to update global pipeline statistics.
   virtual void Initialize(const scoped_refptr<DemuxerStream>& stream,
                           const PipelineStatusCB& callback,
-                          const StatisticsCallback& stats_callback) = 0;
+                          const StatisticsCB& statistics_cb) = 0;
 
   // Request samples to be decoded and returned via the provided callback.
   // Only one read may be in flight at any given time.
@@ -37,7 +37,7 @@ class MEDIA_EXPORT AudioDecoder
   // Read(). This can happen if the DemuxerStream gets flushed and doesn't have
   // any more data to return.
   typedef base::Callback<void(scoped_refptr<Buffer>)> ReadCB;
-  virtual void Read(const ReadCB& callback) = 0;
+  virtual void Read(const ReadCB& read_cb) = 0;
 
   // Reset decoder state, dropping any queued encoded data.
   virtual void Reset(const base::Closure& closure) = 0;
diff --git a/media/base/data_source.h b/media/base/data_source.h
index 9de147e..7577237 100644
--- a/media/base/data_source.h
+++ b/media/base/data_source.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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.
 
@@ -30,7 +30,7 @@ class MEDIA_EXPORT DataSourceHost {
 class MEDIA_EXPORT DataSource : public base::RefCountedThreadSafe<DataSource> {
  public:
   typedef base::Callback<void(int64, int64)> StatusCallback;
-  typedef base::Callback<void(size_t)> ReadCallback;
+  typedef base::Callback<void(size_t)> ReadCB;
   static const size_t kReadError;
 
   DataSource();
@@ -38,13 +38,13 @@ class MEDIA_EXPORT DataSource : public base::RefCountedThreadSafe<DataSource> {
   virtual void set_host(DataSourceHost* host);
 
   // Reads |size| bytes from |position| into |data|. And when the read is done
-  // or failed, |read_callback| is called with the number of bytes read or
+  // or failed, |read_cb| is called with the number of bytes read or
   // kReadError in case of error.
   // TODO(hclam): should change |size| to int! It makes the code so messy
   // with size_t and int all over the place..
   virtual void Read(int64 position, size_t size,
                     uint8* data,
-                    const DataSource::ReadCallback& read_callback) = 0;
+                    const DataSource::ReadCB& read_cb) = 0;
 
   // Notifies the DataSource of a change in the current playback rate.
   virtual void SetPlaybackRate(float playback_rate);
diff --git a/media/base/demuxer_stream.h b/media/base/demuxer_stream.h
index d793d49..457818c 100644
--- a/media/base/demuxer_stream.h
+++ b/media/base/demuxer_stream.h
@@ -30,8 +30,8 @@ class MEDIA_EXPORT DemuxerStream
   // Non-NULL buffer pointers will contain media data or signal the end of the
   // stream. A NULL pointer indicates an aborted Read(). This can happen if the
   // DemuxerStream gets flushed and doesn't have any more data to return.
-  typedef base::Callback<void(const scoped_refptr<Buffer>&)> ReadCallback;
-  virtual void Read(const ReadCallback& read_callback) = 0;
+  typedef base::Callback<void(const scoped_refptr<Buffer>&)> ReadCB;
+  virtual void Read(const ReadCB& read_cb) = 0;
 
   // Returns the audio decoder configuration. It is an error to call this method
   // if type() != AUDIO.
diff --git a/media/base/filters.h b/media/base/filters.h
index c990754..50dc686 100644
--- a/media/base/filters.h
+++ b/media/base/filters.h
@@ -122,10 +122,10 @@ class MEDIA_EXPORT VideoDecoder : public Filter {
  public:
   // Initialize a VideoDecoder with the given DemuxerStream, executing the
   // callback upon completion.
-  // stats_callback is used to update global pipeline statistics.
+  // statistics_cb is used to update global pipeline statistics.
   virtual void Initialize(DemuxerStream* stream,
                           const PipelineStatusCB& callback,
-                          const StatisticsCallback& stats_callback) = 0;
+                          const StatisticsCB& statistics_cb) = 0;
 
   // Request a frame to be decoded and returned via the provided callback.
   // Only one read may be in flight at any given time.
@@ -137,7 +137,7 @@ class MEDIA_EXPORT VideoDecoder : public Filter {
   // the stream. NULL video frames indicate an aborted read. This can happen if
   // the DemuxerStream gets flushed and doesn't have any more data to return.
   typedef base::Callback<void(scoped_refptr<VideoFrame>)> ReadCB;
-  virtual void Read(const ReadCB& callback) = 0;
+  virtual void Read(const ReadCB& read_cb) = 0;
 
   // Returns the natural width and height of decoded video in pixels.
   //
@@ -177,7 +177,7 @@ class MEDIA_EXPORT VideoRenderer : public Filter {
   // callback upon completion.
   virtual void Initialize(VideoDecoder* decoder,
                           const PipelineStatusCB& callback,
-                          const StatisticsCallback& stats_callback,
+                          const StatisticsCB& statistics_cb,
                           const VideoTimeCB& time_cb) = 0;
 
   // Returns true if this filter has received and processed an end-of-stream
diff --git a/media/base/mock_filters.cc b/media/base/mock_filters.cc
index bf07511..74d80e6 100644
--- a/media/base/mock_filters.cc
+++ b/media/base/mock_filters.cc
@@ -189,8 +189,8 @@ MockFilter::MockFilter() {
 
 MockFilter::~MockFilter() {}
 
-MockStatisticsCallback::MockStatisticsCallback() {}
+MockStatisticsCB::MockStatisticsCB() {}
 
-MockStatisticsCallback::~MockStatisticsCallback() {}
+MockStatisticsCB::~MockStatisticsCB() {}
 
 }  // namespace media
diff --git a/media/base/mock_filters.h b/media/base/mock_filters.h
index 6420bb7..d1a472a 100644
--- a/media/base/mock_filters.h
+++ b/media/base/mock_filters.h
@@ -82,7 +82,7 @@ class MockDataSource : public DataSource {
 
   // DataSource implementation.
   MOCK_METHOD4(Read, void(int64 position, size_t size, uint8* data,
-                          const DataSource::ReadCallback& callback));
+                          const DataSource::ReadCB& callback));
   MOCK_METHOD1(GetSize, bool(int64* size_out));
   MOCK_METHOD1(SetPreload, void(Preload preload));
   MOCK_METHOD1(SetBitrate, void(int bitrate));
@@ -163,7 +163,7 @@ class MockDemuxerStream : public DemuxerStream {
 
   // DemuxerStream implementation.
   MOCK_METHOD0(type, Type());
-  MOCK_METHOD1(Read, void(const ReadCallback& read_callback));
+  MOCK_METHOD1(Read, void(const ReadCB& read_cb));
   MOCK_METHOD0(audio_decoder_config, const AudioDecoderConfig&());
   MOCK_METHOD0(video_decoder_config, const VideoDecoderConfig&());
   MOCK_METHOD0(EnableBitstreamConverter, void());
@@ -188,8 +188,8 @@ class MockVideoDecoder : public VideoDecoder {
   // VideoDecoder implementation.
   MOCK_METHOD3(Initialize, void(DemuxerStream* stream,
                                 const PipelineStatusCB& callback,
-                                const StatisticsCallback& stats_callback));
-  MOCK_METHOD1(Read, void(const ReadCB& callback));
+                                const StatisticsCB& statistics_cb));
+  MOCK_METHOD1(Read, void(const ReadCB& read_cb));
   MOCK_METHOD0(natural_size, const gfx::Size&());
   MOCK_CONST_METHOD0(HasAlpha, bool());
 
@@ -207,7 +207,7 @@ class MockAudioDecoder : public AudioDecoder {
   // AudioDecoder implementation.
   MOCK_METHOD3(Initialize, void(const scoped_refptr<DemuxerStream>&,
                                 const PipelineStatusCB&,
-                                const StatisticsCallback&));
+                                const StatisticsCB&));
   MOCK_METHOD1(Read, void(const ReadCB&));
   MOCK_METHOD1(ProduceAudioSamples, void(scoped_refptr<Buffer>));
   MOCK_METHOD0(bits_per_channel, int(void));
@@ -235,7 +235,7 @@ class MockVideoRenderer : public VideoRenderer {
   // VideoRenderer implementation.
   MOCK_METHOD4(Initialize, void(VideoDecoder* decoder,
                                 const PipelineStatusCB& callback,
-                                const StatisticsCallback& stats_callback,
+                                const StatisticsCB& statistics_cb,
                                 const VideoTimeCB& time_cb));
 
   MOCK_METHOD0(HasEnded, bool());
@@ -342,10 +342,10 @@ ACTION_P(DisableAudioRenderer, filter) {
 }
 
 // Helper mock statistics callback.
-class MockStatisticsCallback {
+class MockStatisticsCB {
  public:
-  MockStatisticsCallback();
-  ~MockStatisticsCallback();
+  MockStatisticsCB();
+  ~MockStatisticsCB();
 
   MOCK_METHOD1(OnStatistics, void(const media::PipelineStatistics& statistics));
 };
diff --git a/media/base/pipeline_status.h b/media/base/pipeline_status.h
index aba9bf7..f78bc2a 100644
--- a/media/base/pipeline_status.h
+++ b/media/base/pipeline_status.h
@@ -53,7 +53,7 @@ struct PipelineStatistics {
 };
 
 // Used for updating pipeline statistics.
-typedef base::Callback<void(const PipelineStatistics&)> StatisticsCallback;
+typedef base::Callback<void(const PipelineStatistics&)> StatisticsCB;
 
 }  // namespace media