| Index: media/base/audio_renderer.h
|
| diff --git a/media/base/audio_renderer.h b/media/base/audio_renderer.h
|
| index 586936a1e81bc4e5f94da23ffc12bd2f6904e514..aa59bf30ffd2f563b83801e70de08d9c6f8c07f3 100644
|
| --- a/media/base/audio_renderer.h
|
| +++ b/media/base/audio_renderer.h
|
| @@ -8,7 +8,7 @@
|
| #include "base/callback.h"
|
| #include "base/time/time.h"
|
| #include "media/base/buffering_state.h"
|
| -#include "media/base/decryptor.h"
|
| +#include "media/base/cdm_context.h"
|
| #include "media/base/media_export.h"
|
| #include "media/base/pipeline_status.h"
|
|
|
| @@ -28,8 +28,8 @@ class MEDIA_EXPORT AudioRenderer {
|
| // completion. If initialization fails, only |init_cb| (not |error_cb|) will
|
| // be called.
|
| //
|
| - // |set_decryptor_ready_cb| is fired when a Decryptor is needed, i.e. when the
|
| - // |stream| is encrypted.
|
| + // |set_cdm_ready_cb| is fired when a CDM is needed, i.e. when the |stream| is
|
| + // encrypted.
|
| //
|
| // |statistics_cb| is executed periodically with audio rendering stats.
|
| //
|
| @@ -45,7 +45,7 @@ class MEDIA_EXPORT AudioRenderer {
|
| virtual void Initialize(
|
| DemuxerStream* stream,
|
| const PipelineStatusCB& init_cb,
|
| - const SetDecryptorReadyCB& set_decryptor_ready_cb,
|
| + const SetCdmReadyCB& set_cdm_ready_cb,
|
| const StatisticsCB& statistics_cb,
|
| const BufferingStateCB& buffering_state_cb,
|
| const base::Closure& ended_cb,
|
|
|