summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--content/renderer/media/audio_device.h1
-rw-r--r--content/renderer/render_view_impl.cc6
-rw-r--r--media/audio/null_audio_sink.cc1
-rw-r--r--media/filters/audio_renderer_algorithm.cc (renamed from media/filters/audio_renderer_algorithm_base.cc)52
-rw-r--r--media/filters/audio_renderer_algorithm.h (renamed from media/filters/audio_renderer_algorithm_base.h)18
-rw-r--r--media/filters/audio_renderer_algorithm_unittest.cc (renamed from media/filters/audio_renderer_algorithm_base_unittest.cc)42
-rw-r--r--media/filters/audio_renderer_impl.cc (renamed from media/filters/audio_renderer_base.cc)58
-rw-r--r--media/filters/audio_renderer_impl.h (renamed from media/filters/audio_renderer_base.h)26
-rw-r--r--media/filters/audio_renderer_impl_unittest.cc (renamed from media/filters/audio_renderer_base_unittest.cc)46
-rw-r--r--media/filters/pipeline_integration_test_base.cc4
-rw-r--r--media/media.gyp12
-rw-r--r--media/tools/player_wtl/movie.cc4
-rw-r--r--media/tools/player_x11/player_x11.cc4
-rw-r--r--webkit/media/webmediaplayer_impl.cc4
14 files changed, 138 insertions, 140 deletions
diff --git a/content/renderer/media/audio_device.h b/content/renderer/media/audio_device.h
index e63da0a..74b28d3 100644
--- a/content/renderer/media/audio_device.h
+++ b/content/renderer/media/audio_device.h
@@ -93,7 +93,6 @@ class CONTENT_EXPORT AudioDevice
AudioDevice(const media::AudioParameters& params, RenderCallback* callback);
// AudioRendererSink implementation.
-
virtual void Initialize(const media::AudioParameters& params,
RenderCallback* callback) OVERRIDE;
virtual void Start() OVERRIDE;
diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc
index 9f007ef..b498938 100644
--- a/content/renderer/render_view_impl.cc
+++ b/content/renderer/render_view_impl.cc
@@ -93,7 +93,7 @@
#include "media/base/filter_collection.h"
#include "media/base/media_switches.h"
#include "media/base/message_loop_factory.h"
-#include "media/filters/audio_renderer_base.h"
+#include "media/filters/audio_renderer_impl.h"
#include "media/filters/gpu_video_decoder.h"
#include "net/base/escape.h"
#include "net/base/net_errors.h"
@@ -2174,8 +2174,8 @@ WebMediaPlayer* RenderViewImpl::createMediaPlayer(
// Add the chrome specific audio renderer, using audio_source_provider
// as the sink.
- media::AudioRendererBase* audio_renderer =
- new media::AudioRendererBase(audio_source_provider);
+ media::AudioRendererImpl* audio_renderer =
+ new media::AudioRendererImpl(audio_source_provider);
collection->AddAudioRenderer(audio_renderer);
}
diff --git a/media/audio/null_audio_sink.cc b/media/audio/null_audio_sink.cc
index e8cd4eb..a77d35e 100644
--- a/media/audio/null_audio_sink.cc
+++ b/media/audio/null_audio_sink.cc
@@ -23,7 +23,6 @@ NullAudioSink::~NullAudioSink() {
delete [] audio_data_[i];
}
-
void NullAudioSink::Start() {
if (!thread_.Start())
return;
diff --git a/media/filters/audio_renderer_algorithm_base.cc b/media/filters/audio_renderer_algorithm.cc
index 990c477..8004339 100644
--- a/media/filters/audio_renderer_algorithm_base.cc
+++ b/media/filters/audio_renderer_algorithm.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "media/filters/audio_renderer_algorithm_base.h"
+#include "media/filters/audio_renderer_algorithm.h"
#include <algorithm>
#include <cmath>
@@ -35,7 +35,7 @@ static const double kCrossfadeDuration = 0.008;
static const float kMinPlaybackRate = 0.5f;
static const float kMaxPlaybackRate = 4.0f;
-AudioRendererAlgorithmBase::AudioRendererAlgorithmBase()
+AudioRendererAlgorithm::AudioRendererAlgorithm()
: channels_(0),
samples_per_second_(0),
bytes_per_channel_(0),
@@ -50,9 +50,9 @@ AudioRendererAlgorithmBase::AudioRendererAlgorithmBase()
window_size_(0) {
}
-AudioRendererAlgorithmBase::~AudioRendererAlgorithmBase() {}
+AudioRendererAlgorithm::~AudioRendererAlgorithm() {}
-bool AudioRendererAlgorithmBase::ValidateConfig(
+bool AudioRendererAlgorithm::ValidateConfig(
int channels,
int samples_per_second,
int bits_per_channel) {
@@ -77,7 +77,7 @@ bool AudioRendererAlgorithmBase::ValidateConfig(
return status;
}
-void AudioRendererAlgorithmBase::Initialize(
+void AudioRendererAlgorithm::Initialize(
int channels,
int samples_per_second,
int bits_per_channel,
@@ -104,7 +104,7 @@ void AudioRendererAlgorithmBase::Initialize(
crossfade_buffer_.reset(new uint8[bytes_in_crossfade_]);
}
-int AudioRendererAlgorithmBase::FillBuffer(
+int AudioRendererAlgorithm::FillBuffer(
uint8* dest, int requested_frames) {
DCHECK_NE(bytes_per_frame_, 0);
@@ -136,13 +136,13 @@ int AudioRendererAlgorithmBase::FillBuffer(
return total_frames_rendered;
}
-void AudioRendererAlgorithmBase::ResetWindow() {
+void AudioRendererAlgorithm::ResetWindow() {
DCHECK_LE(index_into_window_, window_size_);
index_into_window_ = 0;
crossfade_frame_number_ = 0;
}
-bool AudioRendererAlgorithmBase::OutputFasterPlayback(uint8* dest) {
+bool AudioRendererAlgorithm::OutputFasterPlayback(uint8* dest) {
DCHECK_LT(index_into_window_, window_size_);
DCHECK_GT(playback_rate_, 1.0);
@@ -231,7 +231,7 @@ bool AudioRendererAlgorithmBase::OutputFasterPlayback(uint8* dest) {
return true;
}
-bool AudioRendererAlgorithmBase::OutputSlowerPlayback(uint8* dest) {
+bool AudioRendererAlgorithm::OutputSlowerPlayback(uint8* dest) {
DCHECK_LT(index_into_window_, window_size_);
DCHECK_LT(playback_rate_, 1.0);
DCHECK_NE(playback_rate_, 0.0);
@@ -314,7 +314,7 @@ bool AudioRendererAlgorithmBase::OutputSlowerPlayback(uint8* dest) {
return true;
}
-bool AudioRendererAlgorithmBase::OutputNormalPlayback(uint8* dest) {
+bool AudioRendererAlgorithm::OutputNormalPlayback(uint8* dest) {
if (audio_buffer_.forward_bytes() >= bytes_per_frame_) {
CopyWithAdvance(dest);
index_into_window_ += bytes_per_frame_;
@@ -323,16 +323,16 @@ bool AudioRendererAlgorithmBase::OutputNormalPlayback(uint8* dest) {
return false;
}
-void AudioRendererAlgorithmBase::CopyWithAdvance(uint8* dest) {
+void AudioRendererAlgorithm::CopyWithAdvance(uint8* dest) {
CopyWithoutAdvance(dest);
DropFrame();
}
-void AudioRendererAlgorithmBase::CopyWithoutAdvance(uint8* dest) {
+void AudioRendererAlgorithm::CopyWithoutAdvance(uint8* dest) {
CopyWithoutAdvance(dest, 0);
}
-void AudioRendererAlgorithmBase::CopyWithoutAdvance(
+void AudioRendererAlgorithm::CopyWithoutAdvance(
uint8* dest, int offset) {
if (muted_) {
memset(dest, 0, bytes_per_frame_);
@@ -342,14 +342,14 @@ void AudioRendererAlgorithmBase::CopyWithoutAdvance(
DCHECK_EQ(bytes_per_frame_, copied);
}
-void AudioRendererAlgorithmBase::DropFrame() {
+void AudioRendererAlgorithm::DropFrame() {
audio_buffer_.Seek(bytes_per_frame_);
if (!IsQueueFull())
request_read_cb_.Run();
}
-void AudioRendererAlgorithmBase::OutputCrossfadedFrame(
+void AudioRendererAlgorithm::OutputCrossfadedFrame(
uint8* outtro, const uint8* intro) {
DCHECK_LE(index_into_window_, window_size_);
DCHECK(!muted_);
@@ -370,7 +370,7 @@ void AudioRendererAlgorithmBase::OutputCrossfadedFrame(
}
template <class Type>
-void AudioRendererAlgorithmBase::CrossfadeFrame(
+void AudioRendererAlgorithm::CrossfadeFrame(
uint8* outtro_bytes, const uint8* intro_bytes) {
Type* outtro = reinterpret_cast<Type*>(outtro_bytes);
const Type* intro = reinterpret_cast<const Type*>(intro_bytes);
@@ -385,7 +385,7 @@ void AudioRendererAlgorithmBase::CrossfadeFrame(
crossfade_frame_number_++;
}
-void AudioRendererAlgorithmBase::SetPlaybackRate(float new_rate) {
+void AudioRendererAlgorithm::SetPlaybackRate(float new_rate) {
DCHECK_GE(new_rate, 0.0);
playback_rate_ = new_rate;
muted_ =
@@ -394,11 +394,11 @@ void AudioRendererAlgorithmBase::SetPlaybackRate(float new_rate) {
ResetWindow();
}
-void AudioRendererAlgorithmBase::AlignToFrameBoundary(int* value) {
+void AudioRendererAlgorithm::AlignToFrameBoundary(int* value) {
(*value) -= ((*value) % bytes_per_frame_);
}
-void AudioRendererAlgorithmBase::FlushBuffers() {
+void AudioRendererAlgorithm::FlushBuffers() {
ResetWindow();
// Clear the queue of decoded packets (releasing the buffers).
@@ -406,11 +406,11 @@ void AudioRendererAlgorithmBase::FlushBuffers() {
request_read_cb_.Run();
}
-base::TimeDelta AudioRendererAlgorithmBase::GetTime() {
+base::TimeDelta AudioRendererAlgorithm::GetTime() {
return audio_buffer_.current_time();
}
-void AudioRendererAlgorithmBase::EnqueueBuffer(Buffer* buffer_in) {
+void AudioRendererAlgorithm::EnqueueBuffer(Buffer* buffer_in) {
DCHECK(!buffer_in->IsEndOfStream());
audio_buffer_.Append(buffer_in);
needs_more_data_ = false;
@@ -420,23 +420,23 @@ void AudioRendererAlgorithmBase::EnqueueBuffer(Buffer* buffer_in) {
request_read_cb_.Run();
}
-bool AudioRendererAlgorithmBase::NeedsMoreData() {
+bool AudioRendererAlgorithm::NeedsMoreData() {
return needs_more_data_ || IsQueueEmpty();
}
-bool AudioRendererAlgorithmBase::IsQueueEmpty() {
+bool AudioRendererAlgorithm::IsQueueEmpty() {
return audio_buffer_.forward_bytes() == 0;
}
-bool AudioRendererAlgorithmBase::IsQueueFull() {
+bool AudioRendererAlgorithm::IsQueueFull() {
return audio_buffer_.forward_bytes() >= audio_buffer_.forward_capacity();
}
-int AudioRendererAlgorithmBase::QueueCapacity() {
+int AudioRendererAlgorithm::QueueCapacity() {
return audio_buffer_.forward_capacity();
}
-void AudioRendererAlgorithmBase::IncreaseQueueCapacity() {
+void AudioRendererAlgorithm::IncreaseQueueCapacity() {
audio_buffer_.set_forward_capacity(
std::min(2 * audio_buffer_.forward_capacity(), kMaxBufferSizeInBytes));
}
diff --git a/media/filters/audio_renderer_algorithm_base.h b/media/filters/audio_renderer_algorithm.h
index 0e5083e..9c0543be 100644
--- a/media/filters/audio_renderer_algorithm_base.h
+++ b/media/filters/audio_renderer_algorithm.h
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-// AudioRendererAlgorithmBase buffers and transforms audio data. The owner of
+// AudioRendererAlgorithm buffers and transforms audio data. The owner of
// this object provides audio data to the object through EnqueueBuffer() and
// requests data from the buffer via FillBuffer(). The owner also sets the
// playback rate, and the AudioRendererAlgorithm will stretch or compress the
@@ -13,14 +13,14 @@
// This class is *not* thread-safe. Calls to enqueue and retrieve data must be
// locked if called from multiple threads.
//
-// AudioRendererAlgorithmBase uses a simple pitch-preservation algorithm to
+// AudioRendererAlgorithm uses a simple pitch-preservation algorithm to
// stretch and compress audio data to meet playback speeds less than and
// greater than the natural playback of the audio stream.
//
// Audio at very low or very high playback rates are muted to preserve quality.
-#ifndef MEDIA_FILTERS_AUDIO_RENDERER_ALGORITHM_BASE_H_
-#define MEDIA_FILTERS_AUDIO_RENDERER_ALGORITHM_BASE_H_
+#ifndef MEDIA_FILTERS_AUDIO_RENDERER_ALGORITHM_H_
+#define MEDIA_FILTERS_AUDIO_RENDERER_ALGORITHM_H_
#include "base/callback.h"
#include "base/gtest_prod_util.h"
@@ -30,10 +30,10 @@ namespace media {
class Buffer;
-class MEDIA_EXPORT AudioRendererAlgorithmBase {
+class MEDIA_EXPORT AudioRendererAlgorithm {
public:
- AudioRendererAlgorithmBase();
- ~AudioRendererAlgorithmBase();
+ AudioRendererAlgorithm();
+ ~AudioRendererAlgorithm();
// Call prior to Initialize() to validate configuration. Returns false if the
// configuration is invalid. Detailed error information will be DVLOG'd.
@@ -195,9 +195,9 @@ class MEDIA_EXPORT AudioRendererAlgorithmBase {
// Window size, in bytes (calculated from audio properties).
int window_size_;
- DISALLOW_COPY_AND_ASSIGN(AudioRendererAlgorithmBase);
+ DISALLOW_COPY_AND_ASSIGN(AudioRendererAlgorithm);
};
} // namespace media
-#endif // MEDIA_FILTERS_AUDIO_RENDERER_ALGORITHM_BASE_H_
+#endif // MEDIA_FILTERS_AUDIO_RENDERER_ALGORITHM_H_
diff --git a/media/filters/audio_renderer_algorithm_base_unittest.cc b/media/filters/audio_renderer_algorithm_unittest.cc
index 77c7761..88c1872 100644
--- a/media/filters/audio_renderer_algorithm_base_unittest.cc
+++ b/media/filters/audio_renderer_algorithm_unittest.cc
@@ -13,7 +13,7 @@
#include "base/bind.h"
#include "base/callback.h"
#include "media/base/data_buffer.h"
-#include "media/filters/audio_renderer_algorithm_base.h"
+#include "media/filters/audio_renderer_algorithm.h"
#include "testing/gtest/include/gtest/gtest.h"
static const size_t kRawDataSize = 10 * 1024;
@@ -23,13 +23,13 @@ static const int kDefaultSampleBits = 16;
namespace media {
-class AudioRendererAlgorithmBaseTest : public testing::Test {
+class AudioRendererAlgorithmTest : public testing::Test {
public:
- AudioRendererAlgorithmBaseTest()
+ AudioRendererAlgorithmTest()
: bytes_enqueued_(0) {
}
- ~AudioRendererAlgorithmBaseTest() {}
+ ~AudioRendererAlgorithmTest() {}
void Initialize() {
Initialize(kDefaultChannels, kDefaultSampleBits);
@@ -38,7 +38,7 @@ class AudioRendererAlgorithmBaseTest : public testing::Test {
void Initialize(int channels, int bits_per_channel) {
algorithm_.Initialize(
channels, kSamplesPerSecond, bits_per_channel, 1.0f,
- base::Bind(&AudioRendererAlgorithmBaseTest::EnqueueData,
+ base::Bind(&AudioRendererAlgorithmTest::EnqueueData,
base::Unretained(this)));
EnqueueData();
}
@@ -179,56 +179,56 @@ class AudioRendererAlgorithmBaseTest : public testing::Test {
}
protected:
- AudioRendererAlgorithmBase algorithm_;
+ AudioRendererAlgorithm algorithm_;
int bytes_enqueued_;
};
-TEST_F(AudioRendererAlgorithmBaseTest, FillBuffer_NormalRate) {
+TEST_F(AudioRendererAlgorithmTest, FillBuffer_NormalRate) {
Initialize();
TestPlaybackRate(1.0);
}
-TEST_F(AudioRendererAlgorithmBaseTest, FillBuffer_OneAndAQuarterRate) {
+TEST_F(AudioRendererAlgorithmTest, FillBuffer_OneAndAQuarterRate) {
Initialize();
TestPlaybackRate(1.25);
}
-TEST_F(AudioRendererAlgorithmBaseTest, FillBuffer_OneAndAHalfRate) {
+TEST_F(AudioRendererAlgorithmTest, FillBuffer_OneAndAHalfRate) {
Initialize();
TestPlaybackRate(1.5);
}
-TEST_F(AudioRendererAlgorithmBaseTest, FillBuffer_DoubleRate) {
+TEST_F(AudioRendererAlgorithmTest, FillBuffer_DoubleRate) {
Initialize();
TestPlaybackRate(2.0);
}
-TEST_F(AudioRendererAlgorithmBaseTest, FillBuffer_EightTimesRate) {
+TEST_F(AudioRendererAlgorithmTest, FillBuffer_EightTimesRate) {
Initialize();
TestPlaybackRate(8.0);
}
-TEST_F(AudioRendererAlgorithmBaseTest, FillBuffer_ThreeQuartersRate) {
+TEST_F(AudioRendererAlgorithmTest, FillBuffer_ThreeQuartersRate) {
Initialize();
TestPlaybackRate(0.75);
}
-TEST_F(AudioRendererAlgorithmBaseTest, FillBuffer_HalfRate) {
+TEST_F(AudioRendererAlgorithmTest, FillBuffer_HalfRate) {
Initialize();
TestPlaybackRate(0.5);
}
-TEST_F(AudioRendererAlgorithmBaseTest, FillBuffer_QuarterRate) {
+TEST_F(AudioRendererAlgorithmTest, FillBuffer_QuarterRate) {
Initialize();
TestPlaybackRate(0.25);
}
-TEST_F(AudioRendererAlgorithmBaseTest, FillBuffer_Pause) {
+TEST_F(AudioRendererAlgorithmTest, FillBuffer_Pause) {
Initialize();
TestPlaybackRate(0.0);
}
-TEST_F(AudioRendererAlgorithmBaseTest, FillBuffer_SlowDown) {
+TEST_F(AudioRendererAlgorithmTest, FillBuffer_SlowDown) {
Initialize();
TestPlaybackRate(4.5);
TestPlaybackRate(3.0);
@@ -238,7 +238,7 @@ TEST_F(AudioRendererAlgorithmBaseTest, FillBuffer_SlowDown) {
TestPlaybackRate(0.25);
}
-TEST_F(AudioRendererAlgorithmBaseTest, FillBuffer_SpeedUp) {
+TEST_F(AudioRendererAlgorithmTest, FillBuffer_SpeedUp) {
Initialize();
TestPlaybackRate(0.25);
TestPlaybackRate(0.5);
@@ -248,7 +248,7 @@ TEST_F(AudioRendererAlgorithmBaseTest, FillBuffer_SpeedUp) {
TestPlaybackRate(4.5);
}
-TEST_F(AudioRendererAlgorithmBaseTest, FillBuffer_JumpAroundSpeeds) {
+TEST_F(AudioRendererAlgorithmTest, FillBuffer_JumpAroundSpeeds) {
Initialize();
TestPlaybackRate(2.1);
TestPlaybackRate(0.9);
@@ -257,7 +257,7 @@ TEST_F(AudioRendererAlgorithmBaseTest, FillBuffer_JumpAroundSpeeds) {
TestPlaybackRate(0.3);
}
-TEST_F(AudioRendererAlgorithmBaseTest, FillBuffer_SmallBufferSize) {
+TEST_F(AudioRendererAlgorithmTest, FillBuffer_SmallBufferSize) {
Initialize();
static const int kBufferSizeInFrames = 1;
static const int kFramesRequested = 2 * kSamplesPerSecond;
@@ -266,7 +266,7 @@ TEST_F(AudioRendererAlgorithmBaseTest, FillBuffer_SmallBufferSize) {
TestPlaybackRate(1.5, kBufferSizeInFrames, kFramesRequested);
}
-TEST_F(AudioRendererAlgorithmBaseTest, FillBuffer_LowerQualityAudio) {
+TEST_F(AudioRendererAlgorithmTest, FillBuffer_LowerQualityAudio) {
static const int kChannels = 1;
static const int kSampleBits = 8;
Initialize(kChannels, kSampleBits);
@@ -275,7 +275,7 @@ TEST_F(AudioRendererAlgorithmBaseTest, FillBuffer_LowerQualityAudio) {
TestPlaybackRate(1.5);
}
-TEST_F(AudioRendererAlgorithmBaseTest, FillBuffer_HigherQualityAudio) {
+TEST_F(AudioRendererAlgorithmTest, FillBuffer_HigherQualityAudio) {
static const int kChannels = 2;
static const int kSampleBits = 32;
Initialize(kChannels, kSampleBits);
diff --git a/media/filters/audio_renderer_base.cc b/media/filters/audio_renderer_impl.cc
index 21d9bc5..ddb2d287 100644
--- a/media/filters/audio_renderer_base.cc
+++ b/media/filters/audio_renderer_impl.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "media/filters/audio_renderer_base.h"
+#include "media/filters/audio_renderer_impl.h"
#include <math.h>
@@ -15,7 +15,7 @@
namespace media {
-AudioRendererBase::AudioRendererBase(media::AudioRendererSink* sink)
+AudioRendererImpl::AudioRendererImpl(media::AudioRendererSink* sink)
: state_(kUninitialized),
pending_read_(false),
received_end_of_stream_(false),
@@ -25,17 +25,17 @@ AudioRendererBase::AudioRendererBase(media::AudioRendererSink* sink)
stopped_(false),
sink_(sink),
is_initialized_(false),
- read_cb_(base::Bind(&AudioRendererBase::DecodedAudioReady,
+ read_cb_(base::Bind(&AudioRendererImpl::DecodedAudioReady,
base::Unretained(this))) {
}
-AudioRendererBase::~AudioRendererBase() {
+AudioRendererImpl::~AudioRendererImpl() {
// Stop() should have been called and |algorithm_| should have been destroyed.
DCHECK(state_ == kUninitialized || state_ == kStopped);
DCHECK(!algorithm_.get());
}
-void AudioRendererBase::Play(const base::Closure& callback) {
+void AudioRendererImpl::Play(const base::Closure& callback) {
{
base::AutoLock auto_lock(lock_);
DCHECK_EQ(kPaused, state_);
@@ -53,13 +53,13 @@ void AudioRendererBase::Play(const base::Closure& callback) {
}
}
-void AudioRendererBase::DoPlay() {
+void AudioRendererImpl::DoPlay() {
earliest_end_time_ = base::Time::Now();
DCHECK(sink_.get());
sink_->Play();
}
-void AudioRendererBase::Pause(const base::Closure& callback) {
+void AudioRendererImpl::Pause(const base::Closure& callback) {
{
base::AutoLock auto_lock(lock_);
DCHECK(state_ == kPlaying || state_ == kUnderflow ||
@@ -80,16 +80,16 @@ void AudioRendererBase::Pause(const base::Closure& callback) {
DoPause();
}
-void AudioRendererBase::DoPause() {
+void AudioRendererImpl::DoPause() {
DCHECK(sink_.get());
sink_->Pause(false);
}
-void AudioRendererBase::Flush(const base::Closure& callback) {
+void AudioRendererImpl::Flush(const base::Closure& callback) {
decoder_->Reset(callback);
}
-void AudioRendererBase::Stop(const base::Closure& callback) {
+void AudioRendererImpl::Stop(const base::Closure& callback) {
if (!stopped_) {
DCHECK(sink_.get());
sink_->Stop();
@@ -108,7 +108,7 @@ void AudioRendererBase::Stop(const base::Closure& callback) {
}
}
-void AudioRendererBase::Seek(base::TimeDelta time, const PipelineStatusCB& cb) {
+void AudioRendererImpl::Seek(base::TimeDelta time, const PipelineStatusCB& cb) {
base::AutoLock auto_lock(lock_);
DCHECK_EQ(kPaused, state_);
DCHECK(!pending_read_) << "Pending read must complete before seeking";
@@ -132,14 +132,14 @@ void AudioRendererBase::Seek(base::TimeDelta time, const PipelineStatusCB& cb) {
DoSeek();
}
-void AudioRendererBase::DoSeek() {
+void AudioRendererImpl::DoSeek() {
earliest_end_time_ = base::Time::Now();
// Pause and flush the stream when we seek to a new location.
sink_->Pause(true);
}
-void AudioRendererBase::Initialize(const scoped_refptr<AudioDecoder>& decoder,
+void AudioRendererImpl::Initialize(const scoped_refptr<AudioDecoder>& decoder,
const PipelineStatusCB& init_cb,
const base::Closure& underflow_cb,
const TimeCB& time_cb) {
@@ -153,10 +153,10 @@ void AudioRendererBase::Initialize(const scoped_refptr<AudioDecoder>& decoder,
time_cb_ = time_cb;
// Create a callback so our algorithm can request more reads.
- base::Closure cb = base::Bind(&AudioRendererBase::ScheduleRead_Locked, this);
+ base::Closure cb = base::Bind(&AudioRendererImpl::ScheduleRead_Locked, this);
// Construct the algorithm.
- algorithm_.reset(new AudioRendererAlgorithmBase());
+ algorithm_.reset(new AudioRendererAlgorithm());
// Initialize our algorithm with media properties, initial playback rate,
// and a callback to request more reads from the data source.
@@ -200,14 +200,14 @@ void AudioRendererBase::Initialize(const scoped_refptr<AudioDecoder>& decoder,
init_cb.Run(PIPELINE_OK);
}
-bool AudioRendererBase::HasEnded() {
+bool AudioRendererImpl::HasEnded() {
base::AutoLock auto_lock(lock_);
DCHECK(!rendered_end_of_stream_ || algorithm_->NeedsMoreData());
return received_end_of_stream_ && rendered_end_of_stream_;
}
-void AudioRendererBase::ResumeAfterUnderflow(bool buffer_more_audio) {
+void AudioRendererImpl::ResumeAfterUnderflow(bool buffer_more_audio) {
base::AutoLock auto_lock(lock_);
if (state_ == kUnderflow) {
if (buffer_more_audio)
@@ -217,13 +217,13 @@ void AudioRendererBase::ResumeAfterUnderflow(bool buffer_more_audio) {
}
}
-void AudioRendererBase::SetVolume(float volume) {
+void AudioRendererImpl::SetVolume(float volume) {
if (stopped_)
return;
sink_->SetVolume(volume);
}
-void AudioRendererBase::DecodedAudioReady(scoped_refptr<Buffer> buffer) {
+void AudioRendererImpl::DecodedAudioReady(scoped_refptr<Buffer> buffer) {
base::AutoLock auto_lock(lock_);
DCHECK(state_ == kPaused || state_ == kSeeking || state_ == kPlaying ||
state_ == kUnderflow || state_ == kRebuffering || state_ == kStopped);
@@ -274,7 +274,7 @@ void AudioRendererBase::DecodedAudioReady(scoped_refptr<Buffer> buffer) {
}
}
-void AudioRendererBase::SignalEndOfStream() {
+void AudioRendererImpl::SignalEndOfStream() {
DCHECK(received_end_of_stream_);
if (!rendered_end_of_stream_) {
rendered_end_of_stream_ = true;
@@ -282,7 +282,7 @@ void AudioRendererBase::SignalEndOfStream() {
}
}
-void AudioRendererBase::ScheduleRead_Locked() {
+void AudioRendererImpl::ScheduleRead_Locked() {
lock_.AssertAcquired();
if (pending_read_ || state_ == kPaused)
return;
@@ -290,7 +290,7 @@ void AudioRendererBase::ScheduleRead_Locked() {
decoder_->Read(read_cb_);
}
-void AudioRendererBase::SetPlaybackRate(float playback_rate) {
+void AudioRendererImpl::SetPlaybackRate(float playback_rate) {
DCHECK_LE(0.0f, playback_rate);
if (!stopped_) {
@@ -312,17 +312,17 @@ void AudioRendererBase::SetPlaybackRate(float playback_rate) {
algorithm_->SetPlaybackRate(playback_rate);
}
-float AudioRendererBase::GetPlaybackRate() {
+float AudioRendererImpl::GetPlaybackRate() {
base::AutoLock auto_lock(lock_);
return algorithm_->playback_rate();
}
-bool AudioRendererBase::IsBeforeSeekTime(const scoped_refptr<Buffer>& buffer) {
+bool AudioRendererImpl::IsBeforeSeekTime(const scoped_refptr<Buffer>& buffer) {
return (state_ == kSeeking) && buffer && !buffer->IsEndOfStream() &&
(buffer->GetTimestamp() + buffer->GetDuration()) < seek_timestamp_;
}
-int AudioRendererBase::Render(const std::vector<float*>& audio_data,
+int AudioRendererImpl::Render(const std::vector<float*>& audio_data,
int number_of_frames,
int audio_delay_milliseconds) {
if (stopped_ || GetPlaybackRate() == 0.0f) {
@@ -374,7 +374,7 @@ int AudioRendererBase::Render(const std::vector<float*>& audio_data,
return frames_filled;
}
-uint32 AudioRendererBase::FillBuffer(uint8* dest,
+uint32 AudioRendererImpl::FillBuffer(uint8* dest,
uint32 requested_frames,
const base::TimeDelta& playback_delay) {
// The |audio_time_buffered_| is the ending timestamp of the last frame
@@ -451,7 +451,7 @@ uint32 AudioRendererBase::FillBuffer(uint8* dest,
return frames_written;
}
-void AudioRendererBase::UpdateEarliestEndTime(int bytes_filled,
+void AudioRendererImpl::UpdateEarliestEndTime(int bytes_filled,
base::TimeDelta request_delay,
base::Time time_now) {
if (bytes_filled != 0) {
@@ -468,7 +468,7 @@ void AudioRendererBase::UpdateEarliestEndTime(int bytes_filled,
}
}
-base::TimeDelta AudioRendererBase::ConvertToDuration(int bytes) {
+base::TimeDelta AudioRendererImpl::ConvertToDuration(int bytes) {
if (bytes_per_second_) {
return base::TimeDelta::FromMicroseconds(
base::Time::kMicrosecondsPerSecond * bytes / bytes_per_second_);
@@ -476,7 +476,7 @@ base::TimeDelta AudioRendererBase::ConvertToDuration(int bytes) {
return base::TimeDelta();
}
-void AudioRendererBase::OnRenderError() {
+void AudioRendererImpl::OnRenderError() {
host()->DisableAudioRenderer();
}
diff --git a/media/filters/audio_renderer_base.h b/media/filters/audio_renderer_impl.h
index 776bee0..e39f75b 100644
--- a/media/filters/audio_renderer_base.h
+++ b/media/filters/audio_renderer_impl.h
@@ -13,12 +13,12 @@
// 3. Audio thread created by the AudioRendererSink.
// Render() is called here where audio data is decoded into raw PCM data.
//
-// AudioRendererBase talks to an AudioRendererAlgorithmBase that takes care of
+// AudioRendererImpl talks to an AudioRendererAlgorithm that takes care of
// queueing audio data and stretching/shrinking audio data when playback rate !=
// 1.0 or 0.0.
-#ifndef MEDIA_FILTERS_AUDIO_RENDERER_BASE_H_
-#define MEDIA_FILTERS_AUDIO_RENDERER_BASE_H_
+#ifndef MEDIA_FILTERS_AUDIO_RENDERER_IMPL_H_
+#define MEDIA_FILTERS_AUDIO_RENDERER_IMPL_H_
#include <deque>
@@ -27,18 +27,18 @@
#include "media/base/audio_renderer_sink.h"
#include "media/base/buffers.h"
#include "media/base/filters.h"
-#include "media/filters/audio_renderer_algorithm_base.h"
+#include "media/filters/audio_renderer_algorithm.h"
namespace media {
-class MEDIA_EXPORT AudioRendererBase
+class MEDIA_EXPORT AudioRendererImpl
: public AudioRenderer,
NON_EXPORTED_BASE(public media::AudioRendererSink::RenderCallback) {
public:
// Methods called on Render thread ------------------------------------------
// An AudioRendererSink is used as the destination for the rendered audio.
- explicit AudioRendererBase(media::AudioRendererSink* sink);
- virtual ~AudioRendererBase();
+ explicit AudioRendererImpl(media::AudioRendererSink* sink);
+ virtual ~AudioRendererImpl();
// Methods called on pipeline thread ----------------------------------------
// Filter implementation.
@@ -59,9 +59,9 @@ class MEDIA_EXPORT AudioRendererBase
virtual void SetVolume(float volume) OVERRIDE;
private:
- friend class AudioRendererBaseTest;
- FRIEND_TEST_ALL_PREFIXES(AudioRendererBaseTest, EndOfStream);
- FRIEND_TEST_ALL_PREFIXES(AudioRendererBaseTest, Underflow_EndOfStream);
+ friend class AudioRendererImplTest;
+ FRIEND_TEST_ALL_PREFIXES(AudioRendererImplTest, EndOfStream);
+ FRIEND_TEST_ALL_PREFIXES(AudioRendererImplTest, Underflow_EndOfStream);
// Callback from the audio decoder delivering decoded audio samples.
void DecodedAudioReady(scoped_refptr<Buffer> buffer);
@@ -132,7 +132,7 @@ class MEDIA_EXPORT AudioRendererBase
scoped_refptr<AudioDecoder> decoder_;
// Algorithm for scaling audio.
- scoped_ptr<AudioRendererAlgorithmBase> algorithm_;
+ scoped_ptr<AudioRendererAlgorithm> algorithm_;
base::Lock lock_;
@@ -203,9 +203,9 @@ class MEDIA_EXPORT AudioRendererBase
AudioDecoder::ReadCB read_cb_;
- DISALLOW_COPY_AND_ASSIGN(AudioRendererBase);
+ DISALLOW_COPY_AND_ASSIGN(AudioRendererImpl);
};
} // namespace media
-#endif // MEDIA_FILTERS_AUDIO_RENDERER_BASE_H_
+#endif // MEDIA_FILTERS_AUDIO_RENDERER_IMPL_H_
diff --git a/media/filters/audio_renderer_base_unittest.cc b/media/filters/audio_renderer_impl_unittest.cc
index ee756f1..862b734 100644
--- a/media/filters/audio_renderer_base_unittest.cc
+++ b/media/filters/audio_renderer_impl_unittest.cc
@@ -9,7 +9,7 @@
#include "media/base/mock_callback.h"
#include "media/base/mock_filter_host.h"
#include "media/base/mock_filters.h"
-#include "media/filters/audio_renderer_base.h"
+#include "media/filters/audio_renderer_impl.h"
#include "testing/gtest/include/gtest/gtest.h"
using ::testing::_;
@@ -43,17 +43,17 @@ namespace media {
static uint8 kMutedAudio = 0x00;
static uint8 kPlayingAudio = 0x99;
-class AudioRendererBaseTest : public ::testing::Test {
+class AudioRendererImplTest : public ::testing::Test {
public:
// Give the decoder some non-garbage media properties.
- AudioRendererBaseTest()
- : renderer_(new AudioRendererBase(new NiceMock<MockAudioSink>())),
+ AudioRendererImplTest()
+ : renderer_(new AudioRendererImpl(new NiceMock<MockAudioSink>())),
decoder_(new MockAudioDecoder()) {
renderer_->set_host(&host_);
// Queue all reads from the decoder by default.
ON_CALL(*decoder_, Read(_))
- .WillByDefault(Invoke(this, &AudioRendererBaseTest::SaveReadCallback));
+ .WillByDefault(Invoke(this, &AudioRendererImplTest::SaveReadCallback));
// Set up audio properties.
SetSupportedAudioDecoderProperties();
@@ -65,19 +65,19 @@ class AudioRendererBaseTest : public ::testing::Test {
.Times(AnyNumber());
}
- virtual ~AudioRendererBaseTest() {
+ virtual ~AudioRendererImplTest() {
renderer_->Stop(NewExpectedClosure());
}
MOCK_METHOD1(OnSeekComplete, void(PipelineStatus));
PipelineStatusCB NewSeekCB() {
- return base::Bind(&AudioRendererBaseTest::OnSeekComplete,
+ return base::Bind(&AudioRendererImplTest::OnSeekComplete,
base::Unretained(this));
}
MOCK_METHOD0(OnUnderflow, void());
base::Closure NewUnderflowClosure() {
- return base::Bind(&AudioRendererBaseTest::OnUnderflow,
+ return base::Bind(&AudioRendererImplTest::OnUnderflow,
base::Unretained(this));
}
@@ -105,7 +105,7 @@ class AudioRendererBaseTest : public ::testing::Test {
}
AudioRenderer::TimeCB NewAudioTimeClosure() {
- return base::Bind(&AudioRendererBaseTest::OnAudioTimeCallback,
+ return base::Bind(&AudioRendererImplTest::OnAudioTimeCallback,
base::Unretained(this));
}
@@ -224,7 +224,7 @@ class AudioRendererBaseTest : public ::testing::Test {
}
// Fixture members.
- scoped_refptr<AudioRendererBase> renderer_;
+ scoped_refptr<AudioRendererImpl> renderer_;
scoped_refptr<MockAudioDecoder> decoder_;
StrictMock<MockFilterHost> host_;
AudioDecoder::ReadCB read_cb_;
@@ -236,10 +236,10 @@ class AudioRendererBaseTest : public ::testing::Test {
read_cb_ = callback;
}
- DISALLOW_COPY_AND_ASSIGN(AudioRendererBaseTest);
+ DISALLOW_COPY_AND_ASSIGN(AudioRendererImplTest);
};
-TEST_F(AudioRendererBaseTest, Initialize_Failed) {
+TEST_F(AudioRendererImplTest, Initialize_Failed) {
SetUnsupportedAudioDecoderProperties();
renderer_->Initialize(
decoder_,
@@ -250,7 +250,7 @@ TEST_F(AudioRendererBaseTest, Initialize_Failed) {
EXPECT_TRUE(read_cb_.is_null());
}
-TEST_F(AudioRendererBaseTest, Initialize_Successful) {
+TEST_F(AudioRendererImplTest, Initialize_Successful) {
renderer_->Initialize(decoder_, NewExpectedStatusCB(PIPELINE_OK),
NewUnderflowClosure(), NewAudioTimeClosure());
@@ -258,12 +258,12 @@ TEST_F(AudioRendererBaseTest, Initialize_Successful) {
EXPECT_TRUE(read_cb_.is_null());
}
-TEST_F(AudioRendererBaseTest, Preroll) {
+TEST_F(AudioRendererImplTest, Preroll) {
Initialize();
Preroll();
}
-TEST_F(AudioRendererBaseTest, Play) {
+TEST_F(AudioRendererImplTest, Play) {
Initialize();
Preroll();
Play();
@@ -273,7 +273,7 @@ TEST_F(AudioRendererBaseTest, Play) {
EXPECT_TRUE(ConsumeBufferedData(bytes_buffered(), NULL));
}
-TEST_F(AudioRendererBaseTest, EndOfStream) {
+TEST_F(AudioRendererImplTest, EndOfStream) {
Initialize();
Preroll();
Play();
@@ -293,7 +293,7 @@ TEST_F(AudioRendererBaseTest, EndOfStream) {
EXPECT_TRUE(renderer_->HasEnded());
}
-TEST_F(AudioRendererBaseTest, Underflow) {
+TEST_F(AudioRendererImplTest, Underflow) {
Initialize();
Preroll();
Play();
@@ -326,7 +326,7 @@ TEST_F(AudioRendererBaseTest, Underflow) {
EXPECT_FALSE(muted);
}
-TEST_F(AudioRendererBaseTest, Underflow_EndOfStream) {
+TEST_F(AudioRendererImplTest, Underflow_EndOfStream) {
Initialize();
Preroll();
Play();
@@ -364,7 +364,7 @@ TEST_F(AudioRendererBaseTest, Underflow_EndOfStream) {
// Deliver another end of stream buffer and attempt to read to make sure
// we're truly at the end of stream.
//
- // TODO(scherkus): fix AudioRendererBase and AudioRendererAlgorithmBase to
+ // TODO(scherkus): fix AudioRendererImpl and AudioRendererAlgorithmBase to
// stop reading after receiving an end of stream buffer. It should have also
// called NotifyEnded() http://crbug.com/106641
DeliverEndOfStream();
@@ -375,7 +375,7 @@ TEST_F(AudioRendererBaseTest, Underflow_EndOfStream) {
EXPECT_FALSE(muted);
}
-TEST_F(AudioRendererBaseTest, Underflow_ResumeFromCallback) {
+TEST_F(AudioRendererImplTest, Underflow_ResumeFromCallback) {
Initialize();
Preroll();
Play();
@@ -388,7 +388,7 @@ TEST_F(AudioRendererBaseTest, Underflow_ResumeFromCallback) {
// since the decoder hasn't delivered any data after it was drained.
const size_t kDataSize = 1024;
EXPECT_CALL(*this, OnUnderflow())
- .WillOnce(Invoke(this, &AudioRendererBaseTest::CallResumeAfterUnderflow));
+ .WillOnce(Invoke(this, &AudioRendererImplTest::CallResumeAfterUnderflow));
EXPECT_FALSE(ConsumeBufferedData(kDataSize, NULL));
// Verify after resuming that we're still not getting data.
@@ -404,7 +404,7 @@ TEST_F(AudioRendererBaseTest, Underflow_ResumeFromCallback) {
EXPECT_FALSE(muted);
}
-TEST_F(AudioRendererBaseTest, AbortPendingRead_Preroll) {
+TEST_F(AudioRendererImplTest, AbortPendingRead_Preroll) {
Initialize();
// Seek to trigger prerolling.
@@ -422,7 +422,7 @@ TEST_F(AudioRendererBaseTest, AbortPendingRead_Preroll) {
ASSERT_TRUE(read_cb_.is_null());
}
-TEST_F(AudioRendererBaseTest, AbortPendingRead_Pause) {
+TEST_F(AudioRendererImplTest, AbortPendingRead_Pause) {
Initialize();
Preroll();
diff --git a/media/filters/pipeline_integration_test_base.cc b/media/filters/pipeline_integration_test_base.cc
index fb348f1..4d65887 100644
--- a/media/filters/pipeline_integration_test_base.cc
+++ b/media/filters/pipeline_integration_test_base.cc
@@ -7,7 +7,7 @@
#include "base/bind.h"
#include "media/base/media_log.h"
#include "media/audio/null_audio_sink.h"
-#include "media/filters/audio_renderer_base.h"
+#include "media/filters/audio_renderer_impl.h"
#include "media/filters/chunk_demuxer.h"
#include "media/filters/ffmpeg_audio_decoder.h"
#include "media/filters/ffmpeg_demuxer.h"
@@ -178,7 +178,7 @@ PipelineIntegrationTestBase::CreateFilterCollection(
base::Unretained(this)),
false);
collection->AddVideoRenderer(renderer_);
- collection->AddAudioRenderer(new AudioRendererBase(new NullAudioSink()));
+ collection->AddAudioRenderer(new AudioRendererImpl(new NullAudioSink()));
return collection.Pass();
}
diff --git a/media/media.gyp b/media/media.gyp
index 558133c..35b38ca 100644
--- a/media/media.gyp
+++ b/media/media.gyp
@@ -184,10 +184,10 @@
'ffmpeg/file_protocol.h',
'filters/audio_file_reader.cc',
'filters/audio_file_reader.h',
- 'filters/audio_renderer_algorithm_base.cc',
- 'filters/audio_renderer_algorithm_base.h',
- 'filters/audio_renderer_base.cc',
- 'filters/audio_renderer_base.h',
+ 'filters/audio_renderer_algorithm.cc',
+ 'filters/audio_renderer_algorithm.h',
+ 'filters/audio_renderer_impl.cc',
+ 'filters/audio_renderer_impl.h',
'filters/bitstream_converter.cc',
'filters/bitstream_converter.h',
'filters/chunk_demuxer.cc',
@@ -647,8 +647,8 @@
'base/yuv_convert_unittest.cc',
'crypto/aes_decryptor_unittest.cc',
'ffmpeg/ffmpeg_common_unittest.cc',
- 'filters/audio_renderer_algorithm_base_unittest.cc',
- 'filters/audio_renderer_base_unittest.cc',
+ 'filters/audio_renderer_algorithm_unittest.cc',
+ 'filters/audio_renderer_impl_unittest.cc',
'filters/bitstream_converter_unittest.cc',
'filters/chunk_demuxer_unittest.cc',
'filters/ffmpeg_audio_decoder_unittest.cc',
diff --git a/media/tools/player_wtl/movie.cc b/media/tools/player_wtl/movie.cc
index 110acc0..310a5b1 100644
--- a/media/tools/player_wtl/movie.cc
+++ b/media/tools/player_wtl/movie.cc
@@ -14,7 +14,7 @@
#include "media/base/media_log.h"
#include "media/base/message_loop_factory.h"
#include "media/base/pipeline.h"
-#include "media/filters/audio_renderer_base.h"
+#include "media/filters/audio_renderer_impl.h"
#include "media/filters/ffmpeg_audio_decoder.h"
#include "media/filters/ffmpeg_demuxer.h"
#include "media/filters/ffmpeg_video_decoder.h"
@@ -85,7 +85,7 @@ bool Movie::Open(const wchar_t* url, VideoRendererBase* video_renderer) {
// TODO(vrk): Re-enabled audio. (crbug.com/112159)
collection->AddAudioRenderer(
- new media::AudioRendererBase(new media::NullAudioSink()));
+ new media::AudioRendererImpl(new media::NullAudioSink()));
collection->AddVideoRenderer(video_renderer);
// Create and start our pipeline.
diff --git a/media/tools/player_x11/player_x11.cc b/media/tools/player_x11/player_x11.cc
index b22e696..6b028e5 100644
--- a/media/tools/player_x11/player_x11.cc
+++ b/media/tools/player_x11/player_x11.cc
@@ -24,7 +24,7 @@
#include "media/base/message_loop_factory.h"
#include "media/base/pipeline.h"
#include "media/base/video_frame.h"
-#include "media/filters/audio_renderer_base.h"
+#include "media/filters/audio_renderer_impl.h"
#include "media/filters/ffmpeg_audio_decoder.h"
#include "media/filters/ffmpeg_demuxer.h"
#include "media/filters/ffmpeg_video_decoder.h"
@@ -129,7 +129,7 @@ bool InitPipeline(MessageLoop* message_loop,
collection->AddVideoRenderer(g_video_renderer);
collection->AddAudioRenderer(
- new media::AudioRendererBase(new media::NullAudioSink()));
+ new media::AudioRendererImpl(new media::NullAudioSink()));
// Create the pipeline and start it.
*pipeline = new media::Pipeline(message_loop, new media::MediaLog());
diff --git a/webkit/media/webmediaplayer_impl.cc b/webkit/media/webmediaplayer_impl.cc
index 2e945fc..1d44526 100644
--- a/webkit/media/webmediaplayer_impl.cc
+++ b/webkit/media/webmediaplayer_impl.cc
@@ -19,7 +19,7 @@
#include "media/base/media_switches.h"
#include "media/base/pipeline.h"
#include "media/base/video_frame.h"
-#include "media/filters/audio_renderer_base.h"
+#include "media/filters/audio_renderer_impl.h"
#include "media/filters/video_renderer_base.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebVideoFrame.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"
@@ -154,7 +154,7 @@ WebMediaPlayerImpl::WebMediaPlayerImpl(
// Create default audio renderer.
filter_collection_->AddAudioRenderer(
- new media::AudioRendererBase(new media::NullAudioSink()));
+ new media::AudioRendererImpl(new media::NullAudioSink()));
}
WebMediaPlayerImpl::~WebMediaPlayerImpl() {
generated by cgit v1.1 at 2025-02-05 20:01:25 +0000