| Index: chromecast/media/cma/backend/media_pipeline_device_fake.cc
|
| diff --git a/chromecast/media/cma/backend/media_pipeline_device_fake.cc b/chromecast/media/cma/backend/media_pipeline_device_fake.cc
|
| index 40aa8ea3e4fa96b8d57634bd1ccf67c4a52150c0..56ba2ea2e1c43e0c0ac7e838b329141d8acec42c 100644
|
| --- a/chromecast/media/cma/backend/media_pipeline_device_fake.cc
|
| +++ b/chromecast/media/cma/backend/media_pipeline_device_fake.cc
|
| @@ -17,9 +17,8 @@
|
| #include "chromecast/media/cma/backend/media_component_device.h"
|
| #include "chromecast/media/cma/backend/video_pipeline_device.h"
|
| #include "chromecast/media/cma/base/decoder_buffer_base.h"
|
| -#include "media/base/audio_decoder_config.h"
|
| +#include "chromecast/public/media/decoder_config.h"
|
| #include "media/base/buffers.h"
|
| -#include "media/base/video_decoder_config.h"
|
|
|
| namespace chromecast {
|
| namespace media {
|
| @@ -371,14 +370,14 @@ class AudioPipelineDeviceFake : public AudioPipelineDevice {
|
| const FrameStatusCB& completion_cb) override;
|
| base::TimeDelta GetRenderingTime() const override;
|
| base::TimeDelta GetRenderingDelay() const override;
|
| - bool SetConfig(const ::media::AudioDecoderConfig& config) override;
|
| + bool SetConfig(const AudioConfig& config) override;
|
| void SetStreamVolumeMultiplier(float multiplier) override;
|
| bool GetStatistics(Statistics* stats) const override;
|
|
|
| private:
|
| scoped_ptr<MediaComponentDeviceFake> fake_pipeline_;
|
|
|
| - ::media::AudioDecoderConfig config_;
|
| + AudioConfig config_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(AudioPipelineDeviceFake);
|
| };
|
| @@ -409,7 +408,7 @@ bool AudioPipelineDeviceFake::SetState(State new_state) {
|
| DCHECK(config_.IsValidConfig());
|
| }
|
| if (new_state == kStateUninitialized) {
|
| - config_ = ::media::AudioDecoderConfig();
|
| + config_ = AudioConfig();
|
| }
|
| return true;
|
| }
|
| @@ -433,8 +432,7 @@ base::TimeDelta AudioPipelineDeviceFake::GetRenderingDelay() const {
|
| return fake_pipeline_->GetRenderingDelay();
|
| }
|
|
|
| -bool AudioPipelineDeviceFake::SetConfig(
|
| - const ::media::AudioDecoderConfig& config) {
|
| +bool AudioPipelineDeviceFake::SetConfig(const AudioConfig& config) {
|
| DCHECK(CalledOnValidThread());
|
| if (!config.IsValidConfig())
|
| return false;
|
| @@ -468,13 +466,13 @@ class VideoPipelineDeviceFake : public VideoPipelineDevice {
|
| base::TimeDelta GetRenderingTime() const override;
|
| base::TimeDelta GetRenderingDelay() const override;
|
| void SetVideoClient(const VideoClient& client) override;
|
| - bool SetConfig(const ::media::VideoDecoderConfig& config) override;
|
| + bool SetConfig(const VideoConfig& config) override;
|
| bool GetStatistics(Statistics* stats) const override;
|
|
|
| private:
|
| scoped_ptr<MediaComponentDeviceFake> fake_pipeline_;
|
|
|
| - ::media::VideoDecoderConfig config_;
|
| + VideoConfig config_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(VideoPipelineDeviceFake);
|
| };
|
| @@ -505,7 +503,7 @@ bool VideoPipelineDeviceFake::SetState(State new_state) {
|
| DCHECK(config_.IsValidConfig());
|
| }
|
| if (new_state == kStateUninitialized) {
|
| - config_ = ::media::VideoDecoderConfig();
|
| + config_ = VideoConfig();
|
| }
|
| return true;
|
| }
|
| @@ -532,8 +530,7 @@ base::TimeDelta VideoPipelineDeviceFake::GetRenderingDelay() const {
|
| void VideoPipelineDeviceFake::SetVideoClient(const VideoClient& client) {
|
| }
|
|
|
| -bool VideoPipelineDeviceFake::SetConfig(
|
| - const ::media::VideoDecoderConfig& config) {
|
| +bool VideoPipelineDeviceFake::SetConfig(const VideoConfig& config) {
|
| DCHECK(CalledOnValidThread());
|
| if (!config.IsValidConfig())
|
| return false;
|
|
|