diff options
| author | servolk <servolk@chromium.org> | 2015-03-03 16:21:31 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-03-04 00:22:09 +0000 |
| commit | 0bf9ad1d1bef7c2c843a8f69c02d5889827ba841 (patch) | |
| tree | 25b132fe6dce76050e67d292eea8affc24e3a51f /chromecast | |
| parent | 19f04a05b39e5586cba79eaba009ae675ca6aad1 (diff) | |
| download | chromium_src-0bf9ad1d1bef7c2c843a8f69c02d5889827ba841.zip chromium_src-0bf9ad1d1bef7c2c843a8f69c02d5889827ba841.tar.gz chromium_src-0bf9ad1d1bef7c2c843a8f69c02d5889827ba841.tar.bz2 | |
Chromecast: Fix build in chromecast_media_renderer_factory.cc
BUG=none
Review URL: https://codereview.chromium.org/973263002
Cr-Commit-Position: refs/heads/master@{#318975}
Diffstat (limited to 'chromecast')
| -rw-r--r-- | chromecast/media/base/switching_media_renderer.cc | 6 | ||||
| -rw-r--r-- | chromecast/media/base/switching_media_renderer.h | 3 | ||||
| -rw-r--r-- | chromecast/renderer/media/chromecast_media_renderer_factory.cc | 1 |
3 files changed, 7 insertions, 3 deletions
diff --git a/chromecast/media/base/switching_media_renderer.cc b/chromecast/media/base/switching_media_renderer.cc index 16ffd12..4380dc3 100644 --- a/chromecast/media/base/switching_media_renderer.cc +++ b/chromecast/media/base/switching_media_renderer.cc @@ -31,7 +31,8 @@ void SwitchingMediaRenderer::Initialize( const ::media::BufferingStateCB& buffering_state_cb, const ::media::Renderer::PaintCB& paint_cb, const base::Closure& ended_cb, - const ::media::PipelineStatusCB& error_cb) { + const ::media::PipelineStatusCB& error_cb, + const base::Closure& waiting_for_decryption_key_cb) { // At this point the DemuxerStreamProvider should be fully initialized, so we // have enough information to decide which renderer to use. demuxer_stream_provider_ = demuxer_stream_provider; @@ -52,7 +53,8 @@ void SwitchingMediaRenderer::Initialize( return GetRenderer()->Initialize(demuxer_stream_provider, init_cb, statistics_cb, buffering_state_cb, - paint_cb, ended_cb, error_cb); + paint_cb, ended_cb, error_cb, + waiting_for_decryption_key_cb); } ::media::Renderer* SwitchingMediaRenderer::GetRenderer() const { diff --git a/chromecast/media/base/switching_media_renderer.h b/chromecast/media/base/switching_media_renderer.h index 0f23162..0829675 100644 --- a/chromecast/media/base/switching_media_renderer.h +++ b/chromecast/media/base/switching_media_renderer.h @@ -38,7 +38,8 @@ class SwitchingMediaRenderer : public ::media::Renderer { const ::media::BufferingStateCB& buffering_state_cb, const ::media::Renderer::PaintCB& paint_cb, const base::Closure& ended_cb, - const ::media::PipelineStatusCB& error_cb) override; + const ::media::PipelineStatusCB& error_cb, + const base::Closure& waiting_for_decryption_key_cb) override; void SetCdm(::media::CdmContext* cdm_context, const ::media::CdmAttachedCB& cdm_attached_cb) override; void Flush(const base::Closure& flush_cb) override; diff --git a/chromecast/renderer/media/chromecast_media_renderer_factory.cc b/chromecast/renderer/media/chromecast_media_renderer_factory.cc index 4c7e36d..cdfab39 100644 --- a/chromecast/renderer/media/chromecast_media_renderer_factory.cc +++ b/chromecast/renderer/media/chromecast_media_renderer_factory.cc @@ -12,6 +12,7 @@ #include "media/base/audio_hardware_config.h" #include "media/base/media_log.h" #include "media/renderers/default_renderer_factory.h" +#include "media/renderers/gpu_video_accelerator_factories.h" namespace chromecast { namespace media { |