Introduce VideoConfig/AudioConfig class for CMA backend

chromecast/media/cma/backend/media_pipeline_device_fake.cc

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..60d9576764a73e12991a7372561f13330d803103 100644
--- a/chromecast/media/cma/backend/media_pipeline_device_fake.cc
+++ b/chromecast/media/cma/backend/media_pipeline_device_fake.cc
@@ -5,6 +5,7 @@
 #include "chromecast/media/cma/backend/media_pipeline_device_fake.h"
 
 #include <list>
+#include <vector>
 
 #include "base/bind.h"
 #include "base/callback_helpers.h"
@@ -17,9 +18,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 +371,15 @@ 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_;
+  std::vector<uint8_t> config_extra_data_;
 
   DISALLOW_COPY_AND_ASSIGN(AudioPipelineDeviceFake);
 };
@@ -406,10 +407,10 @@ bool AudioPipelineDeviceFake::SetState(State new_state) {
     return false;
 
   if (new_state == kStateIdle) {
-    DCHECK(config_.IsValidConfig());
+    DCHECK(IsValidConfig(config_));
   }
   if (new_state == kStateUninitialized) {
-    config_ = ::media::AudioDecoderConfig();
+    config_ = AudioConfig();
   }
   return true;
 }
@@ -433,12 +434,16 @@ 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())
+  if (!IsValidConfig(config))
     return false;
   config_ = config;
+  if (config.extra_data_size > 0)
+    config_extra_data_.assign(config.extra_data,
+                              config.extra_data + config.extra_data_size);
+  else
+    config_extra_data_.clear();
   return true;
 }
 
@@ -468,13 +473,14 @@ 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_;
+  std::vector<uint8_t> config_extra_data_;
 
   DISALLOW_COPY_AND_ASSIGN(VideoPipelineDeviceFake);
 };
@@ -502,10 +508,10 @@ bool VideoPipelineDeviceFake::SetState(State new_state) {
     return false;
 
   if (new_state == kStateIdle) {
-    DCHECK(config_.IsValidConfig());
+    DCHECK(IsValidConfig(config_));
   }
   if (new_state == kStateUninitialized) {
-    config_ = ::media::VideoDecoderConfig();
+    config_ = VideoConfig();
   }
   return true;
 }
@@ -532,12 +538,16 @@ 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())
+  if (!IsValidConfig(config))
     return false;
   config_ = config;
+  if (config.extra_data_size > 0)
+    config_extra_data_.assign(config.extra_data,
+                              config.extra_data + config.extra_data_size);
+  else
+    config_extra_data_.clear();
   return true;
 }