Chromecast: replay buildfixes in SwitchingMediaRenderer code.

Chromecast: replay buildfixes in SwitchingMediaRenderer code.

Double-revert seems to have deleted the fixes:
https://groups.google.com/a/chromium.org/forum/#!topic/chromium-dev/9ufqvcvv_DU

R=lcwu@chromium.org,servolk@chromium.org
BUG=None

Committed: https://crrev.com/b9f93849a2dc16b90265bd1f2c8bd65109c4a1e4
Cr-Commit-Position: refs/heads/master@{#319082}

[lcwu1, 2015-03-04 17:44:41]

lgtm

[gunsch, 2015-03-04 17:46:44]

The CQ bit was checked by gunsch@chromium.org

[commit-bot: I haz the power, 2015-03-04 17:47:12]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/979913002/1

[chromium-reviews, 2015-03-04 18:01:09]

lgtm, thanks for taking care of this!

On Wed, Mar 4, 2015 at 9:43 AM, <gunsch@chromium.org> wrote:

> Reviewers: lcwu1, servolk,
>
> Description:
> Chromecast: replay buildfixes in SwitchingMediaRenderer code.
>
> Double-revert seems to have deleted the fixes:
> https://groups.google.com/a/chromium.org/forum/#!topic/
> chromium-dev/9ufqvcvv_DU
>
> R=lcwu@chromium.org,servolk@chromium.org
> BUG=None
>
> Please review this at https://codereview.chromium.org/979913002/
>
> Base URL: https://chromium.googlesource.com/chromium/src.git@master
>
> Affected files (+10, -7 lines):
>   M chromecast/media/base/switching_media_renderer.h
>   M chromecast/media/base/switching_media_renderer.cc
>   M chromecast/renderer/media/chromecast_media_renderer_factory.cc
>
>
> Index: chromecast/media/base/switching_media_renderer.cc
> diff --git a/chromecast/media/base/switching_media_renderer.cc
> b/chromecast/media/base/switching_media_renderer.cc
> index 16ffd12b77256b7d714f2766f654b0ca6f94c261..
> ec8b1521e4a2fdbadf973840cf6a6d144d027c8a 100644
> --- a/chromecast/media/base/switching_media_renderer.cc
> +++ b/chromecast/media/base/switching_media_renderer.cc
> @@ -26,12 +26,13 @@ SwitchingMediaRenderer::~SwitchingMediaRenderer() {
>
>  void SwitchingMediaRenderer::Initialize(
>      ::media::DemuxerStreamProvider* demuxer_stream_provider,
> -    const base::Closure& init_cb,
> +    const ::media::PipelineStatusCB& init_cb,
>      const ::media::StatisticsCB& statistics_cb,
>      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;
> @@ -50,9 +51,9 @@ void SwitchingMediaRenderer::Initialize(
>      default_renderer_.reset();
>    }
>
> -  return GetRenderer()->Initialize(demuxer_stream_provider,
> -                                   init_cb, statistics_cb,
> buffering_state_cb,
> -                                   paint_cb, ended_cb, error_cb);
> +  return GetRenderer()->Initialize(
> +      demuxer_stream_provider, init_cb, statistics_cb, buffering_state_cb,
> +      paint_cb, ended_cb, error_cb, waiting_for_decryption_key_cb);
>  }
>
>  ::media::Renderer* SwitchingMediaRenderer::GetRenderer() const {
> Index: chromecast/media/base/switching_media_renderer.h
> diff --git a/chromecast/media/base/switching_media_renderer.h
> b/chromecast/media/base/switching_media_renderer.h
> index 0f2316236d2e8bb3be4d47e5903b87a2f5e0f2bb..
> 830cef671e0c22587850b1d32c7fdc6d09543b94 100644
> --- a/chromecast/media/base/switching_media_renderer.h
> +++ b/chromecast/media/base/switching_media_renderer.h
> @@ -33,12 +33,13 @@ class SwitchingMediaRenderer : public
> ::media::Renderer {
>    // ::media::Renderer implementation:
>    void Initialize(
>        ::media::DemuxerStreamProvider* demuxer_stream_provider,
> -      const base::Closure& init_cb,
> +      const ::media::PipelineStatusCB& init_cb,
>        const ::media::StatisticsCB& statistics_cb,
>        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;
> Index: chromecast/renderer/media/chromecast_media_renderer_factory.cc
> diff --git a/chromecast/renderer/media/chromecast_media_renderer_factory.cc
> b/chromecast/renderer/media/chromecast_media_renderer_factory.cc
> index 4c7e36df67dcfa291cdef1a1ff6d5384e4574191..
> cdfab39f13920068b510c6d9ff84a027cddaa264 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 {
>
>
>

To unsubscribe from this group and stop receiving emails from it, send an email
to chromium-reviews+unsubscribe@chromium.org.

[commit-bot: I haz the power, 2015-03-04 18:03:51]

Committed patchset #1 (id:1)

[commit-bot: I haz the power, 2015-03-04 18:06:30]

Patchset 1 (id:??) landed as
https://crrev.com/b9f93849a2dc16b90265bd1f2c8bd65109c4a1e4
Cr-Commit-Position: refs/heads/master@{#319082}