Introduce VideoConfig/AudioConfig class for CMA backend

chromecast/media/cma/pipeline/audio_pipeline_impl.cc

 // Copyright 2014 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.
 
 #include "chromecast/media/cma/pipeline/audio_pipeline_impl.h"
 
 #include "base/bind.h"
 #include "chromecast/media/cma/backend/audio_pipeline_device.h"
 #include "chromecast/media/cma/base/buffering_defs.h"
 #include "chromecast/media/cma/base/cma_logging.h"
 #include "chromecast/media/cma/base/coded_frame_provider.h"
+#include "chromecast/media/cma/base/decoder_config_adapter.h"
 #include "chromecast/media/cma/pipeline/av_pipeline_impl.h"
+#include "chromecast/public/media/decoder_config.h"
 #include "media/base/audio_decoder_config.h"
 
 namespace chromecast {
 namespace media {
 
 namespace {
 const size_t kMaxAudioFrameSize = 32 * 1024;
 }
 
 AudioPipelineImpl::AudioPipelineImpl(AudioPipelineDevice* audio_device)
@@ skipping 77 matching lines @@
 
 void AudioPipelineImpl::Initialize(
     const ::media::AudioDecoderConfig& audio_config,
     scoped_ptr<CodedFrameProvider> frame_provider,
     const ::media::PipelineStatusCB& status_cb) {
   CMALOG(kLogControl) << "AudioPipelineImpl::Initialize "
                       << audio_config.AsHumanReadableString();
   if (frame_provider)
     SetCodedFrameProvider(frame_provider.Pass());
 
-  if (!audio_device_->SetConfig(audio_config) ||
+  if (!audio_device_->SetConfig(
+         DecoderConfigAdapter::ToDecoderConfig(audio_config)) ||
       !av_pipeline_impl_->Initialize()) {
     status_cb.Run(::media::PIPELINE_ERROR_INITIALIZATION_FAILED);
     return;
   }
   av_pipeline_impl_->TransitionToState(AvPipelineImpl::kFlushed);
   status_cb.Run(::media::PIPELINE_OK);
 }
 
 void AudioPipelineImpl::SetVolume(float volume) {
   audio_device_->SetStreamVolumeMultiplier(volume);
 }
 
 void AudioPipelineImpl::OnUpdateConfig(
     const ::media::AudioDecoderConfig& audio_config,
     const ::media::VideoDecoderConfig& video_config) {
   if (audio_config.IsValidConfig()) {
     CMALOG(kLogControl) << "AudioPipelineImpl::OnUpdateConfig "
                         << audio_config.AsHumanReadableString();
 
-    bool success = audio_device_->SetConfig(audio_config);
+    bool success =

[gunsch, 2015/04/17 01:38:51]

two lines is okay, no need to wrap to three

[erickung1, 2015/04/29 08:52:20]

Done.

+        audio_device_->SetConfig(
+            DecoderConfigAdapter::ToDecoderConfig(audio_config));
     if (!success && !audio_client_.playback_error_cb.is_null())
       audio_client_.playback_error_cb.Run(::media::PIPELINE_ERROR_DECODE);
   }
 }
 
 void AudioPipelineImpl::UpdateStatistics() {
   if (audio_client_.statistics_cb.is_null())
     return;
 
   MediaComponentDevice::Statistics device_stats;
   if (!audio_device_->GetStatistics(&device_stats))
     return;
 
   ::media::PipelineStatistics current_stats;
   current_stats.audio_bytes_decoded = device_stats.decoded_bytes;
 
   ::media::PipelineStatistics delta_stats;
   delta_stats.audio_bytes_decoded =
       current_stats.audio_bytes_decoded - previous_stats_.audio_bytes_decoded;
 
   previous_stats_ = current_stats;
 
   audio_client_.statistics_cb.Run(delta_stats);
 }
 
 }  // namespace media
 }  // namespace chromecast