Chromium Code Reviews| 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 995746a4a103587f3b9708d379bd073221e6c6f9..d022ec2712bfceab47dd16bd46ca02416e2cb1e2 100644 |
| --- a/media/formats/webm/webm_audio_client.cc |
| +++ b/media/formats/webm/webm_audio_client.cc |
| @@ -6,6 +6,7 @@ |
| #include "media/base/audio_decoder_config.h" |
| #include "media/base/channel_layout.h" |
| +#include "media/base/encryption_scheme.h" |
| #include "media/formats/webm/webm_constants.h" |
| namespace media { |
| @@ -75,16 +76,12 @@ 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, |
| + EncryptionScheme(is_encrypted), |
|
ddorwin
2015/12/10 18:36:02
Even here, it might make sense to explicitly say A
dougsteed
2015/12/14 21:19:02
I wasn't aware that WebM was like that. But even s
ddorwin
2016/03/01 02:17:41
I'd rather be explicit than rely on a default, esp
dougsteed
2016/03/02 18:07:52
Done.
|
| + base::TimeDelta::FromMicroseconds( |
| + (seek_preroll != -1 ? seek_preroll : 0) / 1000), |
| + codec_delay_in_frames); |
| return config->IsValidConfig(); |
| } |