Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2)

Unified Diff: chromecast/media/cma/backend/media_pipeline_device_fake.cc

Issue 1074383002: Introduce VideoConfig/AudioConfig class for CMA backend (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: single DecoderConfig structure for both Audio and Video Created 5 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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..ed401d3ce916d12030a607829341ebab06311862 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 DecoderConfig& config) override;
void SetStreamVolumeMultiplier(float multiplier) override;
bool GetStatistics(Statistics* stats) const override;
private:
scoped_ptr<MediaComponentDeviceFake> fake_pipeline_;
- ::media::AudioDecoderConfig config_;
+ DecoderConfig config_;
DISALLOW_COPY_AND_ASSIGN(AudioPipelineDeviceFake);
};
@@ -406,10 +405,10 @@ bool AudioPipelineDeviceFake::SetState(State new_state) {
return false;
if (new_state == kStateIdle) {
- DCHECK(config_.IsValidConfig());
+ DCHECK(config_.is_valid_config);
}
if (new_state == kStateUninitialized) {
- config_ = ::media::AudioDecoderConfig();
+ config_ = DecoderConfig();
}
return true;
}
@@ -433,10 +432,9 @@ base::TimeDelta AudioPipelineDeviceFake::GetRenderingDelay() const {
return fake_pipeline_->GetRenderingDelay();
}
-bool AudioPipelineDeviceFake::SetConfig(
- const ::media::AudioDecoderConfig& config) {
+bool AudioPipelineDeviceFake::SetConfig(const DecoderConfig& config) {
DCHECK(CalledOnValidThread());
- if (!config.IsValidConfig())
+ if (!config.is_valid_config)
return false;
config_ = config;
return true;
@@ -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 DecoderConfig& config) override;
bool GetStatistics(Statistics* stats) const override;
private:
scoped_ptr<MediaComponentDeviceFake> fake_pipeline_;
- ::media::VideoDecoderConfig config_;
+ DecoderConfig config_;
DISALLOW_COPY_AND_ASSIGN(VideoPipelineDeviceFake);
};
@@ -502,10 +500,10 @@ bool VideoPipelineDeviceFake::SetState(State new_state) {
return false;
if (new_state == kStateIdle) {
- DCHECK(config_.IsValidConfig());
+ DCHECK(config_.is_valid_config);
}
if (new_state == kStateUninitialized) {
- config_ = ::media::VideoDecoderConfig();
+ config_ = DecoderConfig();
}
return true;
}
@@ -532,10 +530,9 @@ base::TimeDelta VideoPipelineDeviceFake::GetRenderingDelay() const {
void VideoPipelineDeviceFake::SetVideoClient(const VideoClient& client) {
}
-bool VideoPipelineDeviceFake::SetConfig(
- const ::media::VideoDecoderConfig& config) {
+bool VideoPipelineDeviceFake::SetConfig(const DecoderConfig& config) {
DCHECK(CalledOnValidThread());
- if (!config.IsValidConfig())
+ if (!config.is_valid_config)
return false;
config_ = config;
return true;

Powered by Google App Engine
This is Rietveld 408576698