Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "media/renderers/renderer_impl.h" | 5 #include "media/renderers/renderer_impl.h" |
| 6 | 6 |
| 7 #include <utility> | 7 #include <utility> |
| 8 | 8 |
| 9 #include "base/bind.h" | 9 #include "base/bind.h" |
| 10 #include "base/callback.h" | 10 #include "base/callback.h" |
| (...skipping 113 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 124 } | 124 } |
| 125 | 125 |
| 126 void RendererImpl::Initialize(DemuxerStreamProvider* demuxer_stream_provider, | 126 void RendererImpl::Initialize(DemuxerStreamProvider* demuxer_stream_provider, |
| 127 RendererClient* client, | 127 RendererClient* client, |
| 128 const PipelineStatusCB& init_cb) { | 128 const PipelineStatusCB& init_cb) { |
| 129 DVLOG(1) << __func__; | 129 DVLOG(1) << __func__; |
| 130 DCHECK(task_runner_->BelongsToCurrentThread()); | 130 DCHECK(task_runner_->BelongsToCurrentThread()); |
| 131 DCHECK_EQ(state_, STATE_UNINITIALIZED); | 131 DCHECK_EQ(state_, STATE_UNINITIALIZED); |
| 132 DCHECK(!init_cb.is_null()); | 132 DCHECK(!init_cb.is_null()); |
| 133 DCHECK(client); | 133 DCHECK(client); |
| 134 DCHECK(demuxer_stream_provider->GetStream(DemuxerStream::AUDIO) || | 134 DCHECK(demuxer_stream_provider->GetStream(DemuxerStream::AUDIO) || |
|
wolenetz
2016/12/08 23:01:02
It looks like this DCHECK might also fail if pipel
servolk
2016/12/09 00:26:31
Yes, I believe this is possible. And we also have
wolenetz
2016/12/09 23:23:00
My point is DCHECKs are meant partially to documen
servolk
2016/12/09 23:31:07
After spending some more time thinking about this
| |
| 135 demuxer_stream_provider->GetStream(DemuxerStream::VIDEO)); | 135 demuxer_stream_provider->GetStream(DemuxerStream::VIDEO)); |
| 136 | 136 |
| 137 client_ = client; | 137 client_ = client; |
| 138 demuxer_stream_provider_ = demuxer_stream_provider; | 138 demuxer_stream_provider_ = demuxer_stream_provider; |
| 139 init_cb_ = init_cb; | 139 init_cb_ = init_cb; |
| 140 | 140 |
| 141 DemuxerStream* audio_stream = | 141 DemuxerStream* audio_stream = |
| 142 demuxer_stream_provider->GetStream(DemuxerStream::AUDIO); | 142 demuxer_stream_provider->GetStream(DemuxerStream::AUDIO); |
| 143 if (audio_stream) | 143 if (audio_stream) |
|
wolenetz
2016/12/08 23:01:02
Does it matter that we're setting up these CB's he
servolk
2016/12/09 00:26:31
It doesn't matter, since the race is only happenin
wolenetz
2016/12/09 23:23:00
Acknowledged.
| |
| 144 audio_stream->SetStreamStatusChangeCB(base::Bind( | 144 audio_stream->SetStreamStatusChangeCB(base::Bind( |
| 145 &RendererImpl::RestartStreamPlayback, weak_this_, audio_stream)); | 145 &RendererImpl::RestartStreamPlayback, weak_this_, audio_stream)); |
| 146 DemuxerStream* video_stream = | 146 DemuxerStream* video_stream = |
| 147 demuxer_stream_provider->GetStream(DemuxerStream::VIDEO); | 147 demuxer_stream_provider->GetStream(DemuxerStream::VIDEO); |
| 148 if (video_stream) | 148 if (video_stream) |
| 149 video_stream->SetStreamStatusChangeCB(base::Bind( | 149 video_stream->SetStreamStatusChangeCB(base::Bind( |
| 150 &RendererImpl::RestartStreamPlayback, weak_this_, video_stream)); | 150 &RendererImpl::RestartStreamPlayback, weak_this_, video_stream)); |
| 151 | 151 |
| 152 if (HasEncryptedStream() && !cdm_context_) { | 152 if (HasEncryptedStream() && !cdm_context_) { |
| 153 state_ = STATE_INIT_PENDING_CDM; | 153 state_ = STATE_INIT_PENDING_CDM; |
| (...skipping 223 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 377 | 377 |
| 378 void RendererImpl::InitializeAudioRenderer() { | 378 void RendererImpl::InitializeAudioRenderer() { |
| 379 DVLOG(1) << __func__; | 379 DVLOG(1) << __func__; |
| 380 DCHECK(task_runner_->BelongsToCurrentThread()); | 380 DCHECK(task_runner_->BelongsToCurrentThread()); |
| 381 DCHECK_EQ(state_, STATE_INITIALIZING); | 381 DCHECK_EQ(state_, STATE_INITIALIZING); |
| 382 DCHECK(!init_cb_.is_null()); | 382 DCHECK(!init_cb_.is_null()); |
| 383 | 383 |
| 384 PipelineStatusCB done_cb = | 384 PipelineStatusCB done_cb = |
| 385 base::Bind(&RendererImpl::OnAudioRendererInitializeDone, weak_this_); | 385 base::Bind(&RendererImpl::OnAudioRendererInitializeDone, weak_this_); |
| 386 | 386 |
| 387 if (!demuxer_stream_provider_->GetStream(DemuxerStream::AUDIO)) { | 387 DemuxerStream* audio_stream = |
| 388 demuxer_stream_provider_->GetStream(DemuxerStream::AUDIO); | |
| 389 if (!audio_stream) { | |
| 388 audio_renderer_.reset(); | 390 audio_renderer_.reset(); |
| 389 task_runner_->PostTask(FROM_HERE, base::Bind(done_cb, PIPELINE_OK)); | 391 task_runner_->PostTask(FROM_HERE, base::Bind(done_cb, PIPELINE_OK)); |
| 390 return; | 392 return; |
| 391 } | 393 } |
| 392 | 394 |
| 393 audio_renderer_client_.reset( | 395 audio_renderer_client_.reset( |
| 394 new RendererClientInternal(DemuxerStream::AUDIO, this)); | 396 new RendererClientInternal(DemuxerStream::AUDIO, this)); |
| 395 // Note: After the initialization of a renderer, error events from it may | 397 // Note: After the initialization of a renderer, error events from it may |
| 396 // happen at any time and all future calls must guard against STATE_ERROR. | 398 // happen at any time and all future calls must guard against STATE_ERROR. |
| 397 audio_renderer_->Initialize( | 399 audio_renderer_->Initialize(audio_stream, cdm_context_, |
| 398 demuxer_stream_provider_->GetStream(DemuxerStream::AUDIO), cdm_context_, | 400 audio_renderer_client_.get(), done_cb); |
| 399 audio_renderer_client_.get(), done_cb); | |
| 400 } | 401 } |
| 401 | 402 |
| 402 void RendererImpl::OnAudioRendererInitializeDone(PipelineStatus status) { | 403 void RendererImpl::OnAudioRendererInitializeDone(PipelineStatus status) { |
| 403 DVLOG(1) << __func__ << ": " << status; | 404 DVLOG(1) << __func__ << ": " << status; |
| 404 DCHECK(task_runner_->BelongsToCurrentThread()); | 405 DCHECK(task_runner_->BelongsToCurrentThread()); |
| 405 | 406 |
| 406 // OnError() may be fired at any time by the renderers, even if they thought | 407 // OnError() may be fired at any time by the renderers, even if they thought |
| 407 // they initialized successfully (due to delayed output device setup). | 408 // they initialized successfully (due to delayed output device setup). |
| 408 if (state_ != STATE_INITIALIZING) { | 409 if (state_ != STATE_INITIALIZING) { |
| 409 DCHECK(init_cb_.is_null()); | 410 DCHECK(init_cb_.is_null()); |
| (...skipping 12 matching lines...) Expand all Loading... | |
| 422 | 423 |
| 423 void RendererImpl::InitializeVideoRenderer() { | 424 void RendererImpl::InitializeVideoRenderer() { |
| 424 DVLOG(1) << __func__; | 425 DVLOG(1) << __func__; |
| 425 DCHECK(task_runner_->BelongsToCurrentThread()); | 426 DCHECK(task_runner_->BelongsToCurrentThread()); |
| 426 DCHECK_EQ(state_, STATE_INITIALIZING); | 427 DCHECK_EQ(state_, STATE_INITIALIZING); |
| 427 DCHECK(!init_cb_.is_null()); | 428 DCHECK(!init_cb_.is_null()); |
| 428 | 429 |
| 429 PipelineStatusCB done_cb = | 430 PipelineStatusCB done_cb = |
| 430 base::Bind(&RendererImpl::OnVideoRendererInitializeDone, weak_this_); | 431 base::Bind(&RendererImpl::OnVideoRendererInitializeDone, weak_this_); |
| 431 | 432 |
| 432 if (!demuxer_stream_provider_->GetStream(DemuxerStream::VIDEO)) { | 433 DemuxerStream* video_stream = |
| 434 demuxer_stream_provider_->GetStream(DemuxerStream::VIDEO); | |
| 435 if (!video_stream) { | |
| 433 video_renderer_.reset(); | 436 video_renderer_.reset(); |
| 434 task_runner_->PostTask(FROM_HERE, base::Bind(done_cb, PIPELINE_OK)); | 437 task_runner_->PostTask(FROM_HERE, base::Bind(done_cb, PIPELINE_OK)); |
| 435 return; | 438 return; |
| 436 } | 439 } |
| 437 | 440 |
| 438 video_renderer_client_.reset( | 441 video_renderer_client_.reset( |
| 439 new RendererClientInternal(DemuxerStream::VIDEO, this)); | 442 new RendererClientInternal(DemuxerStream::VIDEO, this)); |
| 440 video_renderer_->Initialize( | 443 video_renderer_->Initialize( |
| 441 demuxer_stream_provider_->GetStream(DemuxerStream::VIDEO), cdm_context_, | 444 video_stream, cdm_context_, video_renderer_client_.get(), |
| 442 video_renderer_client_.get(), | |
| 443 base::Bind(&RendererImpl::GetWallClockTimes, base::Unretained(this)), | 445 base::Bind(&RendererImpl::GetWallClockTimes, base::Unretained(this)), |
| 444 done_cb); | 446 done_cb); |
| 445 } | 447 } |
| 446 | 448 |
| 447 void RendererImpl::OnVideoRendererInitializeDone(PipelineStatus status) { | 449 void RendererImpl::OnVideoRendererInitializeDone(PipelineStatus status) { |
| 448 DVLOG(1) << __func__ << ": " << status; | 450 DVLOG(1) << __func__ << ": " << status; |
| 449 DCHECK(task_runner_->BelongsToCurrentThread()); | 451 DCHECK(task_runner_->BelongsToCurrentThread()); |
| 450 | 452 |
| 451 // OnError() may be fired at any time by the renderers, even if they thought | 453 // OnError() may be fired at any time by the renderers, even if they thought |
| 452 // they initialized successfully (due to delayed output device setup). | 454 // they initialized successfully (due to delayed output device setup). |
| (...skipping 386 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 839 DCHECK(task_runner_->BelongsToCurrentThread()); | 841 DCHECK(task_runner_->BelongsToCurrentThread()); |
| 840 client_->OnVideoNaturalSizeChange(size); | 842 client_->OnVideoNaturalSizeChange(size); |
| 841 } | 843 } |
| 842 | 844 |
| 843 void RendererImpl::OnVideoOpacityChange(bool opaque) { | 845 void RendererImpl::OnVideoOpacityChange(bool opaque) { |
| 844 DCHECK(task_runner_->BelongsToCurrentThread()); | 846 DCHECK(task_runner_->BelongsToCurrentThread()); |
| 845 client_->OnVideoOpacityChange(opaque); | 847 client_->OnVideoOpacityChange(opaque); |
| 846 } | 848 } |
| 847 | 849 |
| 848 } // namespace media | 850 } // namespace media |
| OLD | NEW |