Commit 60492b54 authored by gunsch's avatar gunsch Committed by Commit bot

Chromecast buildfix: CMA renderer has new Initialize interface.

See: https://codereview.chromium.org/935243002

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

Review URL: https://codereview.chromium.org/976473002

Cr-Commit-Position: refs/heads/master@{#318809}
parent f6629637
...@@ -75,7 +75,8 @@ void CmaRenderer::Initialize( ...@@ -75,7 +75,8 @@ void CmaRenderer::Initialize(
const ::media::BufferingStateCB& buffering_state_cb, const ::media::BufferingStateCB& buffering_state_cb,
const PaintCB& paint_cb, const PaintCB& paint_cb,
const base::Closure& ended_cb, const base::Closure& ended_cb,
const ::media::PipelineStatusCB& error_cb) { const ::media::PipelineStatusCB& error_cb,
const base::Closure& waiting_for_decryption_key_cb) {
CMALOG(kLogControl) << __FUNCTION__; CMALOG(kLogControl) << __FUNCTION__;
DCHECK(thread_checker_.CalledOnValidThread()); DCHECK(thread_checker_.CalledOnValidThread());
DCHECK_EQ(state_, kUninitialized) << state_; DCHECK_EQ(state_, kUninitialized) << state_;
...@@ -84,6 +85,7 @@ void CmaRenderer::Initialize( ...@@ -84,6 +85,7 @@ void CmaRenderer::Initialize(
DCHECK(!ended_cb.is_null()); DCHECK(!ended_cb.is_null());
DCHECK(!error_cb.is_null()); DCHECK(!error_cb.is_null());
DCHECK(!buffering_state_cb.is_null()); DCHECK(!buffering_state_cb.is_null());
DCHECK(!waiting_for_decryption_key_cb.is_null());
DCHECK(demuxer_stream_provider->GetStream(::media::DemuxerStream::AUDIO) || DCHECK(demuxer_stream_provider->GetStream(::media::DemuxerStream::AUDIO) ||
demuxer_stream_provider->GetStream(::media::DemuxerStream::VIDEO)); demuxer_stream_provider->GetStream(::media::DemuxerStream::VIDEO));
...@@ -95,6 +97,8 @@ void CmaRenderer::Initialize( ...@@ -95,6 +97,8 @@ void CmaRenderer::Initialize(
paint_cb_ = paint_cb; paint_cb_ = paint_cb;
ended_cb_ = ended_cb; ended_cb_ = ended_cb;
error_cb_ = error_cb; error_cb_ = error_cb;
// TODO(erickung): wire up waiting_for_decryption_key_cb.
waiting_for_decryption_key_cb_ = waiting_for_decryption_key_cb;
MediaPipelineClient media_pipeline_client; MediaPipelineClient media_pipeline_client;
media_pipeline_client.error_cb = error_cb_; media_pipeline_client.error_cb = error_cb_;
......
...@@ -45,7 +45,8 @@ class CmaRenderer : public ::media::Renderer { ...@@ -45,7 +45,8 @@ class CmaRenderer : public ::media::Renderer {
const ::media::BufferingStateCB& buffering_state_cb, const ::media::BufferingStateCB& buffering_state_cb,
const PaintCB& paint_cb, const PaintCB& paint_cb,
const base::Closure& ended_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 Flush(const base::Closure& flush_cb) override; void Flush(const base::Closure& flush_cb) override;
void StartPlayingFrom(base::TimeDelta time) override; void StartPlayingFrom(base::TimeDelta time) override;
void SetPlaybackRate(float playback_rate) override; void SetPlaybackRate(float playback_rate) override;
...@@ -108,6 +109,7 @@ class CmaRenderer : public ::media::Renderer { ...@@ -108,6 +109,7 @@ class CmaRenderer : public ::media::Renderer {
::media::PipelineStatusCB error_cb_; ::media::PipelineStatusCB error_cb_;
::media::BufferingStateCB buffering_state_cb_; ::media::BufferingStateCB buffering_state_cb_;
base::Closure flush_cb_; base::Closure flush_cb_;
base::Closure waiting_for_decryption_key_cb_;
// Renderer state. // Renderer state.
// Used mostly for checking that transitions are correct. // Used mostly for checking that transitions are correct.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment