Chromecast: Use std::vector to pass video config in CMA

chromecast/media/cma/pipeline/video_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/video_pipeline_impl.h"
 
 #include "base/bind.h"
 #include "chromecast/media/cma/backend/video_pipeline_device.h"
 #include "chromecast/media/cma/base/buffering_defs.h"
 #include "chromecast/media/cma/base/cma_logging.h"
@@ skipping 83 matching lines @@
 void VideoPipelineImpl::SetCdm(BrowserCdmCast* media_keys) {
   av_pipeline_impl_->SetCdm(media_keys);
 }
 
 void VideoPipelineImpl::SetClient(const VideoPipelineClient& client) {
   video_client_ = client;
   av_pipeline_impl_->SetClient(client.av_pipeline_client);
 }
 
 void VideoPipelineImpl::Initialize(
-    const ::media::VideoDecoderConfig& video_config,
+    const std::vector<::media::VideoDecoderConfig>& configs,
     scoped_ptr<CodedFrameProvider> frame_provider,
     const ::media::PipelineStatusCB& status_cb) {
-  CMALOG(kLogControl) << "VideoPipelineImpl::Initialize "
-                      << video_config.AsHumanReadableString();
+  CMALOG(kLogControl) << __FUNCTION__ << " config (" << configs.size() << ")";
   VideoPipelineDevice::VideoClient client;
   client.natural_size_changed_cb =
       base::Bind(&VideoPipelineImpl::OnNaturalSizeChanged, weak_this_);
   video_device_->SetVideoClient(client);
   if (frame_provider)
     SetCodedFrameProvider(frame_provider.Pass());
 
-  if (!video_device_->SetConfig(
-          DecoderConfigAdapter::ToCastVideoConfig(kPrimary, video_config)) ||
+  if (configs.empty()) {
+     status_cb.Run(::media::PIPELINE_ERROR_INITIALIZATION_FAILED);
+     return;
+  }
+  DCHECK(configs.size() <= 2);
+  DCHECK(configs[0].IsValidConfig());
+  VideoConfig video_config =
+      DecoderConfigAdapter::ToCastVideoConfig(kPrimary, configs[0]);
+  VideoConfig secondary_config;
+  if (configs.size() == 2) {
+    DCHECK(configs[1].IsValidConfig());
+    secondary_config = DecoderConfigAdapter::ToCastVideoConfig(kSecondary,
+                                                               configs[1]);
+    video_config.additional_config = &secondary_config;
+  }
+
+  if (!video_device_->SetConfig(video_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 VideoPipelineImpl::OnUpdateConfig(
     StreamId id,
@@ skipping 42 matching lines @@
   delta_stats.video_frames_dropped =
       current_stats.video_frames_dropped - previous_stats_.video_frames_dropped;
 
   previous_stats_ = current_stats;
 
   video_client_.av_pipeline_client.statistics_cb.Run(delta_stats);
 }
 
 }  // namespace media
 }  // namespace chromecast