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

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

Issue 1490613005: media config: expand is_encrypted to a struct. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: one more tweak in chromecast/common Created 5 years 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_decoder_software_wrapper.cc
diff --git a/chromecast/media/cma/pipeline/audio_decoder_software_wrapper.cc b/chromecast/media/cma/pipeline/audio_decoder_software_wrapper.cc
index 4b15bcc532d54db65330edcfb7d1cc2638b26571..dc8de2d9863ec1018d2a94911233b8174c857728 100644
--- a/chromecast/media/cma/pipeline/audio_decoder_software_wrapper.cc
+++ b/chromecast/media/cma/pipeline/audio_decoder_software_wrapper.cc
@@ -59,7 +59,7 @@ bool AudioDecoderSoftwareWrapper::SetConfig(const AudioConfig& config) {
return true;
}
- if (config.is_encrypted || !CreateSoftwareDecoder(config))
+ if (config.is_encrypted() || !CreateSoftwareDecoder(config))
return false;
output_config_.codec = media::kCodecPCM;
@@ -67,7 +67,7 @@ bool AudioDecoderSoftwareWrapper::SetConfig(const AudioConfig& config) {
output_config_.channel_number = 2;
output_config_.bytes_per_channel = 2;
output_config_.samples_per_second = config.samples_per_second;
- output_config_.is_encrypted = false;
+ output_config_.encryption_scheme = EncryptionScheme(false);
halliwell 2016/01/13 03:29:41 another example of 'false' ... not instantly reada
dougsteed 2016/02/09 22:58:53 Done.
return backend_decoder_->SetConfig(output_config_);
}

Powered by Google App Engine
This is Rietveld 408576698