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

Unified Diff: media/formats/webm/webm_audio_client.cc

Issue 1490613005: media config: expand is_encrypted to a struct. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: missed a couple comments Created 4 years, 10 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: media/formats/webm/webm_audio_client.cc
diff --git a/media/formats/webm/webm_audio_client.cc b/media/formats/webm/webm_audio_client.cc
index fb6a723a4d2a3f65fe48a73f85a1127aac05edbb..173d81fe95786efe64b860b502b65891fc4a202f 100644
--- a/media/formats/webm/webm_audio_client.cc
+++ b/media/formats/webm/webm_audio_client.cc
@@ -29,7 +29,7 @@ bool WebMAudioClient::InitializeConfig(
const std::vector<uint8_t>& codec_private,
int64_t seek_preroll,
int64_t codec_delay,
- bool is_encrypted,
+ const EncryptionScheme& encryption_scheme,
AudioDecoderConfig* config) {
DCHECK(config);
SampleFormat sample_format = kSampleFormatPlanarF32;
@@ -78,16 +78,11 @@ bool WebMAudioClient::InitializeConfig(
base::Time::kNanosecondsPerSecond);
}
- config->Initialize(
- audio_codec,
- sample_format,
- channel_layout,
- samples_per_second,
- codec_private,
- is_encrypted,
- base::TimeDelta::FromMicroseconds(
- (seek_preroll != -1 ? seek_preroll : 0) / 1000),
- codec_delay_in_frames);
+ config->Initialize(audio_codec, sample_format, channel_layout,
+ samples_per_second, codec_private, encryption_scheme,
+ base::TimeDelta::FromMicroseconds(
+ (seek_preroll != -1 ? seek_preroll : 0) / 1000),
+ codec_delay_in_frames);
return config->IsValidConfig();
}

Powered by Google App Engine
This is Rietveld 408576698