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

Unified Diff: chromecast/media/cma/pipeline/audio_pipeline_impl.cc

Issue 1074383002: Introduce VideoConfig/AudioConfig class for CMA backend (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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/pipeline/audio_pipeline_impl.cc
diff --git a/chromecast/media/cma/pipeline/audio_pipeline_impl.cc b/chromecast/media/cma/pipeline/audio_pipeline_impl.cc
index 404031faa56d06d23903106a253bf83906dbe4db..a2a500f9901947eb52d9db2a5a4edba7ecf2cec9 100644
--- a/chromecast/media/cma/pipeline/audio_pipeline_impl.cc
+++ b/chromecast/media/cma/pipeline/audio_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/audio_decoder_config.h"
namespace chromecast {
@@ -107,7 +110,8 @@ void AudioPipelineImpl::Initialize(
if (frame_provider)
SetCodedFrameProvider(frame_provider.Pass());
- if (!audio_device_->SetConfig(audio_config) ||
+ if (!audio_device_->SetConfig(
+ DecoderConfigAdapter::ToAudioConfig(audio_config)) ||
!av_pipeline_impl_->Initialize()) {
status_cb.Run(::media::PIPELINE_ERROR_INITIALIZATION_FAILED);
return;
@@ -127,7 +131,9 @@ void AudioPipelineImpl::OnUpdateConfig(
CMALOG(kLogControl) << "AudioPipelineImpl::OnUpdateConfig "
<< audio_config.AsHumanReadableString();
- bool success = audio_device_->SetConfig(audio_config);
+ bool success =
+ audio_device_->SetConfig(
+ DecoderConfigAdapter::ToAudioConfig(audio_config));
if (!success && !audio_client_.playback_error_cb.is_null())
audio_client_.playback_error_cb.Run(::media::PIPELINE_ERROR_DECODE);
}

Powered by Google App Engine
This is Rietveld 408576698