| 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();
|
| }
|
|
|
|
|