| Index: chromecast/media/cma/pipeline/video_pipeline_impl.cc
|
| diff --git a/chromecast/media/cma/pipeline/video_pipeline_impl.cc b/chromecast/media/cma/pipeline/video_pipeline_impl.cc
|
| index d3ae9bec1a911f9a4050961593010d39302f06c4..195c836aac0b2a48dbdc6f513b9de9835fdc4eab 100644
|
| --- a/chromecast/media/cma/pipeline/video_pipeline_impl.cc
|
| +++ b/chromecast/media/cma/pipeline/video_pipeline_impl.cc
|
| @@ -9,7 +9,10 @@
|
| #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/media/cma/public/audio_config.h"
|
| +#include "chromecast/media/cma/public/video_config.h"
|
| #include "media/base/video_decoder_config.h"
|
|
|
| namespace chromecast {
|
| @@ -111,7 +114,8 @@ void VideoPipelineImpl::Initialize(
|
| if (frame_provider)
|
| SetCodedFrameProvider(frame_provider.Pass());
|
|
|
| - if (!video_device_->SetConfig(video_config) ||
|
| + if (!video_device_->SetConfig(
|
| + DecoderConfigAdapter::ToVideoConfig(video_config)) ||
|
| !av_pipeline_impl_->Initialize()) {
|
| status_cb.Run(::media::PIPELINE_ERROR_INITIALIZATION_FAILED);
|
| return;
|
| @@ -127,7 +131,9 @@ void VideoPipelineImpl::OnUpdateConfig(
|
| CMALOG(kLogControl) << "VideoPipelineImpl::OnUpdateConfig "
|
| << video_config.AsHumanReadableString();
|
|
|
| - bool success = video_device_->SetConfig(video_config);
|
| + bool success =
|
| + video_device_->SetConfig(
|
| + DecoderConfigAdapter::ToVideoConfig(video_config));
|
| if (!success &&
|
| !video_client_.av_pipeline_client.playback_error_cb.is_null()) {
|
| video_client_.av_pipeline_client.playback_error_cb.Run(
|
|
|