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 12 matching lines...) Expand all Loading... | |
23 #include "media/base/time_source.h" | 23 #include "media/base/time_source.h" |
24 #include "media/base/video_decoder_config.h" | 24 #include "media/base/video_decoder_config.h" |
25 #include "media/base/video_renderer.h" | 25 #include "media/base/video_renderer.h" |
26 #include "media/base/wall_clock_time_source.h" | 26 #include "media/base/wall_clock_time_source.h" |
27 | 27 |
28 namespace media { | 28 namespace media { |
29 | 29 |
30 // See |video_underflow_threshold_|. | 30 // See |video_underflow_threshold_|. |
31 static const int kDefaultVideoUnderflowThresholdMs = 3000; | 31 static const int kDefaultVideoUnderflowThresholdMs = 3000; |
32 | 32 |
33 static const int kAudioRestartUnderflowThresholdMs = 2000; | |
34 | |
33 class RendererImpl::RendererClientInternal : public RendererClient { | 35 class RendererImpl::RendererClientInternal : public RendererClient { |
34 public: | 36 public: |
35 RendererClientInternal(DemuxerStream::Type type, RendererImpl* renderer) | 37 RendererClientInternal(DemuxerStream::Type type, RendererImpl* renderer) |
36 : type_(type), renderer_(renderer) { | 38 : type_(type), renderer_(renderer) { |
37 DCHECK((type_ == DemuxerStream::AUDIO) || (type_ == DemuxerStream::VIDEO)); | 39 DCHECK((type_ == DemuxerStream::AUDIO) || (type_ == DemuxerStream::VIDEO)); |
38 } | 40 } |
39 | 41 |
40 void OnError(PipelineStatus error) override { renderer_->OnError(error); } | 42 void OnError(PipelineStatus error) override { renderer_->OnError(error); } |
41 void OnEnded() override { renderer_->OnRendererEnded(type_); } | 43 void OnEnded() override { renderer_->OnRendererEnded(type_); } |
42 void OnStatisticsUpdate(const PipelineStatistics& stats) override { | 44 void OnStatisticsUpdate(const PipelineStatistics& stats) override { |
(...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
122 DCHECK_EQ(state_, STATE_UNINITIALIZED); | 124 DCHECK_EQ(state_, STATE_UNINITIALIZED); |
123 DCHECK(!init_cb.is_null()); | 125 DCHECK(!init_cb.is_null()); |
124 DCHECK(client); | 126 DCHECK(client); |
125 DCHECK(demuxer_stream_provider->GetStream(DemuxerStream::AUDIO) || | 127 DCHECK(demuxer_stream_provider->GetStream(DemuxerStream::AUDIO) || |
126 demuxer_stream_provider->GetStream(DemuxerStream::VIDEO)); | 128 demuxer_stream_provider->GetStream(DemuxerStream::VIDEO)); |
127 | 129 |
128 client_ = client; | 130 client_ = client; |
129 demuxer_stream_provider_ = demuxer_stream_provider; | 131 demuxer_stream_provider_ = demuxer_stream_provider; |
130 init_cb_ = init_cb; | 132 init_cb_ = init_cb; |
131 | 133 |
134 DemuxerStream* audio_stream = | |
135 demuxer_stream_provider->GetStream(DemuxerStream::AUDIO); | |
136 if (audio_stream) | |
137 audio_stream->SetStreamRestartedCB( | |
138 base::Bind(&RendererImpl::RestartStreamPlayback, weak_this_)); | |
139 DemuxerStream* video_stream = | |
140 demuxer_stream_provider->GetStream(DemuxerStream::VIDEO); | |
141 if (video_stream) | |
142 video_stream->SetStreamRestartedCB( | |
143 base::Bind(&RendererImpl::RestartStreamPlayback, weak_this_)); | |
144 | |
132 if (HasEncryptedStream() && !cdm_context_) { | 145 if (HasEncryptedStream() && !cdm_context_) { |
133 state_ = STATE_INIT_PENDING_CDM; | 146 state_ = STATE_INIT_PENDING_CDM; |
134 return; | 147 return; |
135 } | 148 } |
136 | 149 |
137 state_ = STATE_INITIALIZING; | 150 state_ = STATE_INITIALIZING; |
138 InitializeAudioRenderer(); | 151 InitializeAudioRenderer(); |
139 } | 152 } |
140 | 153 |
141 void RendererImpl::SetCdm(CdmContext* cdm_context, | 154 void RendererImpl::SetCdm(CdmContext* cdm_context, |
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
194 } | 207 } |
195 | 208 |
196 time_source_->SetMediaTime(time); | 209 time_source_->SetMediaTime(time); |
197 | 210 |
198 if (audio_renderer_) | 211 if (audio_renderer_) |
199 audio_renderer_->StartPlaying(); | 212 audio_renderer_->StartPlaying(); |
200 if (video_renderer_) | 213 if (video_renderer_) |
201 video_renderer_->StartPlayingFrom(time); | 214 video_renderer_->StartPlayingFrom(time); |
202 } | 215 } |
203 | 216 |
217 void RendererImpl::RestartStreamPlayback(DemuxerStream* stream, | |
218 base::TimeDelta time) { | |
219 DVLOG(1) << __FUNCTION__ << " stream=" << stream | |
220 << " time=" << time.InSecondsF(); | |
221 DCHECK(task_runner_->BelongsToCurrentThread()); | |
222 if (stream->type() == DemuxerStream::VIDEO) { | |
223 DCHECK(video_renderer_); | |
224 if (restarting_video_) | |
225 return; | |
226 restarting_video_ = true; | |
227 video_renderer_->Flush( | |
228 base::Bind(&RendererImpl::RestartVideoRenderer, weak_this_, time)); | |
229 } else if (stream->type() == DemuxerStream::AUDIO) { | |
230 DCHECK(audio_renderer_); | |
231 DCHECK(time_source_); | |
232 if (restarting_audio_) | |
233 return; | |
234 restarting_audio_ = true; | |
235 // Stop ticking (transition into paused state) in audio renderer before | |
236 // calling Flush, since after Flush we are going to restart playback by | |
237 // calling audio renderer StartPlaying which would fail in playing state. | |
238 if (time_ticking_) { | |
239 time_ticking_ = false; | |
240 time_source_->StopTicking(); | |
241 } | |
242 audio_renderer_->Flush( | |
243 base::Bind(&RendererImpl::RestartAudioRenderer, weak_this_, time)); | |
244 } | |
245 } | |
246 | |
247 void RendererImpl::RestartVideoRenderer(base::TimeDelta time) { | |
248 DCHECK(task_runner_->BelongsToCurrentThread()); | |
249 DVLOG(2) << __FUNCTION__; | |
250 video_ended_ = false; | |
251 if (state_ == STATE_PLAYING) { | |
252 DCHECK(video_renderer_); | |
253 video_renderer_->StartPlayingFrom(time); | |
254 } | |
255 } | |
256 | |
257 void RendererImpl::RestartAudioRenderer(base::TimeDelta time) { | |
258 DCHECK(task_runner_->BelongsToCurrentThread()); | |
259 DVLOG(2) << __FUNCTION__; | |
260 audio_ended_ = false; | |
261 if (state_ == STATE_PLAYING) { | |
262 DCHECK(time_source_); | |
263 DCHECK(audio_renderer_); | |
264 audio_renderer_->StartPlaying(); | |
chcunningham
2016/06/29 22:49:13
I think you still need to call time_source_->SetMe
servolk
2016/06/29 23:40:13
Ok, maybe that was a stray unrelated dcheck then,
servolk
2016/06/30 00:06:11
No, unfortunately that wasn't a stray dcheck. I do
| |
265 } | |
266 } | |
267 | |
204 void RendererImpl::SetPlaybackRate(double playback_rate) { | 268 void RendererImpl::SetPlaybackRate(double playback_rate) { |
205 DVLOG(1) << __FUNCTION__ << "(" << playback_rate << ")"; | 269 DVLOG(1) << __FUNCTION__ << "(" << playback_rate << ")"; |
206 DCHECK(task_runner_->BelongsToCurrentThread()); | 270 DCHECK(task_runner_->BelongsToCurrentThread()); |
207 | 271 |
208 // Playback rate changes are only carried out while playing. | 272 // Playback rate changes are only carried out while playing. |
209 if (state_ != STATE_PLAYING) | 273 if (state_ != STATE_PLAYING) |
210 return; | 274 return; |
211 | 275 |
212 time_source_->SetPlaybackRate(playback_rate); | 276 time_source_->SetPlaybackRate(playback_rate); |
213 | 277 |
(...skipping 267 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
481 video_ended_ = false; | 545 video_ended_ = false; |
482 state_ = STATE_PLAYING; | 546 state_ = STATE_PLAYING; |
483 base::ResetAndReturn(&flush_cb_).Run(); | 547 base::ResetAndReturn(&flush_cb_).Run(); |
484 } | 548 } |
485 | 549 |
486 void RendererImpl::OnStatisticsUpdate(const PipelineStatistics& stats) { | 550 void RendererImpl::OnStatisticsUpdate(const PipelineStatistics& stats) { |
487 DCHECK(task_runner_->BelongsToCurrentThread()); | 551 DCHECK(task_runner_->BelongsToCurrentThread()); |
488 client_->OnStatisticsUpdate(stats); | 552 client_->OnStatisticsUpdate(stats); |
489 } | 553 } |
490 | 554 |
555 namespace { | |
556 | |
557 const char* BufferingStateStr(BufferingState state) { | |
558 switch (state) { | |
559 case BUFFERING_HAVE_NOTHING: | |
560 return "HAVE_NOTHING"; | |
561 case BUFFERING_HAVE_ENOUGH: | |
562 return "HAVE_ENOUGH"; | |
563 } | |
564 NOTREACHED(); | |
565 return ""; | |
566 } | |
567 } | |
568 | |
491 void RendererImpl::OnBufferingStateChange(DemuxerStream::Type type, | 569 void RendererImpl::OnBufferingStateChange(DemuxerStream::Type type, |
chcunningham
2016/06/29 22:49:13
This method was once very simple, but it now has l
servolk
2016/06/29 23:40:13
Done.
| |
492 BufferingState new_buffering_state) { | 570 BufferingState new_buffering_state) { |
493 DCHECK((type == DemuxerStream::AUDIO) || (type == DemuxerStream::VIDEO)); | 571 DCHECK((type == DemuxerStream::AUDIO) || (type == DemuxerStream::VIDEO)); |
494 BufferingState* buffering_state = type == DemuxerStream::AUDIO | 572 BufferingState* buffering_state = type == DemuxerStream::AUDIO |
495 ? &audio_buffering_state_ | 573 ? &audio_buffering_state_ |
496 : &video_buffering_state_; | 574 : &video_buffering_state_; |
497 | 575 |
498 DVLOG(1) << __FUNCTION__ << "(" << *buffering_state << ", " | 576 DVLOG(1) << __FUNCTION__ |
499 << new_buffering_state << ") " | 577 << (type == DemuxerStream::AUDIO ? " audio " : " video ") |
500 << (type == DemuxerStream::AUDIO ? "audio" : "video"); | 578 << BufferingStateStr(*buffering_state) << " -> " |
579 << BufferingStateStr(new_buffering_state); | |
501 DCHECK(task_runner_->BelongsToCurrentThread()); | 580 DCHECK(task_runner_->BelongsToCurrentThread()); |
502 | 581 |
503 bool was_waiting_for_enough_data = WaitingForEnoughData(); | 582 bool was_waiting_for_enough_data = WaitingForEnoughData(); |
504 | 583 |
584 // When restarting playback we want to defer the BUFFERING_HAVE_NOTHING for | |
585 // the stream being restarted, to allow continuing uninterrupted playback on | |
586 // the other stream. | |
587 if (type == DemuxerStream::VIDEO && restarting_video_) { | |
588 if (new_buffering_state == BUFFERING_HAVE_ENOUGH) { | |
589 DVLOG(1) << __FUNCTION__ << " Got BUFFERING_HAVE_ENOUGH for video stream," | |
590 " resuming playback."; | |
591 restarting_video_ = false; | |
592 if (state_ == STATE_PLAYING && !deferred_underflow_cb_.IsCancelled()) { | |
593 // If deferred_underflow_cb_ wasn't triggered, then audio should still | |
594 // be playing, we only need to unpause the video stream. | |
595 deferred_underflow_cb_.Cancel(); | |
596 video_buffering_state_ = new_buffering_state; | |
597 if (playback_rate_ > 0) | |
598 video_renderer_->OnTimeStateChanged(true); | |
599 return; | |
600 } | |
601 } | |
602 // Fall through to the regular video underflow handling path. | |
603 } | |
604 | |
605 if (type == DemuxerStream::AUDIO && restarting_audio_) { | |
606 if (new_buffering_state == BUFFERING_HAVE_NOTHING) { | |
607 if (deferred_underflow_cb_.IsCancelled() && | |
chcunningham
2016/06/29 22:49:13
can you rename this to make it clear that this one
servolk
2016/06/29 23:40:13
Done.
| |
608 deferred_audio_restart_underflow_cb_.IsCancelled()) { | |
609 DVLOG(1) << __FUNCTION__ << " Deferring BUFFERING_HAVE_NOTHING for " | |
610 "audio stream which is being restarted."; | |
611 deferred_audio_restart_underflow_cb_.Reset( | |
612 base::Bind(&RendererImpl::OnBufferingStateChange, weak_this_, type, | |
613 new_buffering_state)); | |
614 task_runner_->PostDelayedTask( | |
615 FROM_HERE, deferred_audio_restart_underflow_cb_.callback(), | |
616 base::TimeDelta::FromMilliseconds( | |
617 kAudioRestartUnderflowThresholdMs)); | |
618 return; | |
619 } | |
620 // Cancel the deferred callback and report an underflow immediately. | |
621 DVLOG(4) << "deferred_audio_restart_underflow_cb_.Cancel()"; | |
622 deferred_audio_restart_underflow_cb_.Cancel(); | |
623 } else if (new_buffering_state == BUFFERING_HAVE_ENOUGH) { | |
624 DVLOG(1) << __FUNCTION__ << " Got BUFFERING_HAVE_ENOUGH for audio stream," | |
625 " resuming playback."; | |
626 deferred_audio_restart_underflow_cb_.Cancel(); | |
627 // Now that we have decoded enough audio, pause playback momentarily to | |
628 // ensure video renderer is synchronised with audio. | |
629 PausePlayback(); | |
chcunningham
2016/06/29 22:49:13
As mentioned above, I think this should go. I don'
servolk
2016/06/29 23:40:13
Acknowledged.
| |
630 restarting_audio_ = false; | |
631 // Ensure that StartPlayback gets invoked below. | |
632 was_waiting_for_enough_data = true; | |
633 } | |
634 } | |
635 | |
505 // When audio is present and has enough data, defer video underflow callbacks | 636 // When audio is present and has enough data, defer video underflow callbacks |
506 // for some time to avoid unnecessary glitches in audio; see | 637 // for some time to avoid unnecessary glitches in audio; see |
507 // http://crbug.com/144683#c53. | 638 // http://crbug.com/144683#c53. |
508 if (audio_renderer_ && type == DemuxerStream::VIDEO && | 639 if (audio_renderer_ && type == DemuxerStream::VIDEO && |
509 state_ == STATE_PLAYING) { | 640 state_ == STATE_PLAYING) { |
510 if (video_buffering_state_ == BUFFERING_HAVE_ENOUGH && | 641 if (video_buffering_state_ == BUFFERING_HAVE_ENOUGH && |
511 audio_buffering_state_ == BUFFERING_HAVE_ENOUGH && | 642 audio_buffering_state_ == BUFFERING_HAVE_ENOUGH && |
512 new_buffering_state == BUFFERING_HAVE_NOTHING && | 643 new_buffering_state == BUFFERING_HAVE_NOTHING && |
513 deferred_underflow_cb_.IsCancelled()) { | 644 deferred_underflow_cb_.IsCancelled()) { |
645 DVLOG(2) << __FUNCTION__ << " Deferring HAVE_NOTHING for video stream."; | |
514 deferred_underflow_cb_.Reset( | 646 deferred_underflow_cb_.Reset( |
515 base::Bind(&RendererImpl::OnBufferingStateChange, | 647 base::Bind(&RendererImpl::OnBufferingStateChange, |
516 weak_factory_.GetWeakPtr(), type, new_buffering_state)); | 648 weak_factory_.GetWeakPtr(), type, new_buffering_state)); |
517 task_runner_->PostDelayedTask(FROM_HERE, | 649 task_runner_->PostDelayedTask(FROM_HERE, |
518 deferred_underflow_cb_.callback(), | 650 deferred_underflow_cb_.callback(), |
519 video_underflow_threshold_); | 651 video_underflow_threshold_); |
520 return; | 652 return; |
521 } | 653 } |
522 | 654 |
655 DVLOG(4) << "deferred_underflow_cb_.Cancel()"; | |
523 deferred_underflow_cb_.Cancel(); | 656 deferred_underflow_cb_.Cancel(); |
524 } else if (!deferred_underflow_cb_.IsCancelled() && | 657 } else if (!deferred_underflow_cb_.IsCancelled() && |
525 type == DemuxerStream::AUDIO && | 658 type == DemuxerStream::AUDIO && |
526 new_buffering_state == BUFFERING_HAVE_NOTHING) { | 659 new_buffering_state == BUFFERING_HAVE_NOTHING) { |
527 // If audio underflows while we have a deferred video underflow in progress | 660 // If audio underflows while we have a deferred video underflow in progress |
528 // we want to mark video as underflowed immediately and cancel the deferral. | 661 // we want to mark video as underflowed immediately and cancel the deferral. |
529 deferred_underflow_cb_.Cancel(); | 662 deferred_underflow_cb_.Cancel(); |
530 video_buffering_state_ = BUFFERING_HAVE_NOTHING; | 663 video_buffering_state_ = BUFFERING_HAVE_NOTHING; |
531 } | 664 } |
532 | 665 |
(...skipping 30 matching lines...) Expand all Loading... | |
563 if (audio_renderer_ && audio_buffering_state_ != BUFFERING_HAVE_ENOUGH) | 696 if (audio_renderer_ && audio_buffering_state_ != BUFFERING_HAVE_ENOUGH) |
564 return true; | 697 return true; |
565 if (video_renderer_ && video_buffering_state_ != BUFFERING_HAVE_ENOUGH) | 698 if (video_renderer_ && video_buffering_state_ != BUFFERING_HAVE_ENOUGH) |
566 return true; | 699 return true; |
567 return false; | 700 return false; |
568 } | 701 } |
569 | 702 |
570 void RendererImpl::PausePlayback() { | 703 void RendererImpl::PausePlayback() { |
571 DVLOG(1) << __FUNCTION__; | 704 DVLOG(1) << __FUNCTION__; |
572 DCHECK(task_runner_->BelongsToCurrentThread()); | 705 DCHECK(task_runner_->BelongsToCurrentThread()); |
573 DCHECK(time_ticking_); | |
574 switch (state_) { | 706 switch (state_) { |
575 case STATE_PLAYING: | 707 case STATE_PLAYING: |
576 DCHECK(PlaybackHasEnded() || WaitingForEnoughData()) | 708 DCHECK(PlaybackHasEnded() || WaitingForEnoughData() || restarting_audio_) |
577 << "Playback should only pause due to ending or underflowing"; | 709 << "Playback should only pause due to ending or underflowing or" |
710 " when restarting audio stream"; | |
711 | |
578 break; | 712 break; |
579 | 713 |
580 case STATE_FLUSHING: | 714 case STATE_FLUSHING: |
581 // It's OK to pause playback when flushing. | 715 // It's OK to pause playback when flushing. |
582 break; | 716 break; |
583 | 717 |
584 case STATE_UNINITIALIZED: | 718 case STATE_UNINITIALIZED: |
585 case STATE_INIT_PENDING_CDM: | 719 case STATE_INIT_PENDING_CDM: |
586 case STATE_INITIALIZING: | 720 case STATE_INITIALIZING: |
587 NOTREACHED() << "Invalid state: " << state_; | 721 NOTREACHED() << "Invalid state: " << state_; |
588 break; | 722 break; |
589 | 723 |
590 case STATE_ERROR: | 724 case STATE_ERROR: |
591 // An error state may occur at any time. | 725 // An error state may occur at any time. |
592 break; | 726 break; |
593 } | 727 } |
594 | 728 |
595 time_ticking_ = false; | 729 if (time_ticking_) { |
596 time_source_->StopTicking(); | 730 time_ticking_ = false; |
731 time_source_->StopTicking(); | |
732 } | |
597 if (playback_rate_ > 0 && video_renderer_) | 733 if (playback_rate_ > 0 && video_renderer_) |
598 video_renderer_->OnTimeStateChanged(false); | 734 video_renderer_->OnTimeStateChanged(false); |
599 } | 735 } |
600 | 736 |
601 void RendererImpl::StartPlayback() { | 737 void RendererImpl::StartPlayback() { |
602 DVLOG(1) << __FUNCTION__; | 738 DVLOG(1) << __FUNCTION__; |
603 DCHECK(task_runner_->BelongsToCurrentThread()); | 739 DCHECK(task_runner_->BelongsToCurrentThread()); |
604 DCHECK_EQ(state_, STATE_PLAYING); | 740 DCHECK_EQ(state_, STATE_PLAYING); |
605 DCHECK(!time_ticking_); | 741 DCHECK(!time_ticking_); |
606 DCHECK(!WaitingForEnoughData()); | 742 DCHECK(!WaitingForEnoughData()); |
607 | 743 |
608 time_ticking_ = true; | 744 time_ticking_ = true; |
609 time_source_->StartTicking(); | 745 time_source_->StartTicking(); |
610 if (playback_rate_ > 0 && video_renderer_) | 746 if (playback_rate_ > 0 && video_renderer_) |
611 video_renderer_->OnTimeStateChanged(true); | 747 video_renderer_->OnTimeStateChanged(true); |
612 } | 748 } |
613 | 749 |
614 void RendererImpl::OnRendererEnded(DemuxerStream::Type type) { | 750 void RendererImpl::OnRendererEnded(DemuxerStream::Type type) { |
615 DVLOG(1) << __FUNCTION__; | 751 DVLOG(1) << __FUNCTION__ |
752 << (type == DemuxerStream::AUDIO ? " audio" : " video"); | |
616 DCHECK(task_runner_->BelongsToCurrentThread()); | 753 DCHECK(task_runner_->BelongsToCurrentThread()); |
617 DCHECK((type == DemuxerStream::AUDIO) || (type == DemuxerStream::VIDEO)); | 754 DCHECK((type == DemuxerStream::AUDIO) || (type == DemuxerStream::VIDEO)); |
618 | 755 |
619 if (state_ != STATE_PLAYING) | 756 if (state_ != STATE_PLAYING) |
620 return; | 757 return; |
621 | 758 |
622 if (type == DemuxerStream::AUDIO) { | 759 if (type == DemuxerStream::AUDIO) { |
623 DCHECK(!audio_ended_); | 760 DCHECK(!audio_ended_); |
624 audio_ended_ = true; | 761 audio_ended_ = true; |
625 } else { | 762 } else { |
626 DCHECK(!video_ended_); | 763 DCHECK(!video_ended_); |
627 video_ended_ = true; | 764 video_ended_ = true; |
765 DCHECK(video_renderer_); | |
766 video_renderer_->OnTimeStateChanged(false); | |
628 } | 767 } |
629 | 768 |
630 RunEndedCallbackIfNeeded(); | 769 RunEndedCallbackIfNeeded(); |
631 } | 770 } |
632 | 771 |
633 bool RendererImpl::PlaybackHasEnded() const { | 772 bool RendererImpl::PlaybackHasEnded() const { |
634 DVLOG(1) << __FUNCTION__; | |
635 DCHECK(task_runner_->BelongsToCurrentThread()); | 773 DCHECK(task_runner_->BelongsToCurrentThread()); |
636 | 774 |
637 if (audio_renderer_ && !audio_ended_) | 775 if (audio_renderer_ && !audio_ended_) |
638 return false; | 776 return false; |
639 | 777 |
640 if (video_renderer_ && !video_ended_) | 778 if (video_renderer_ && !video_ended_) |
641 return false; | 779 return false; |
642 | 780 |
643 return true; | 781 return true; |
644 } | 782 } |
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
691 DCHECK(task_runner_->BelongsToCurrentThread()); | 829 DCHECK(task_runner_->BelongsToCurrentThread()); |
692 client_->OnVideoNaturalSizeChange(size); | 830 client_->OnVideoNaturalSizeChange(size); |
693 } | 831 } |
694 | 832 |
695 void RendererImpl::OnVideoOpacityChange(bool opaque) { | 833 void RendererImpl::OnVideoOpacityChange(bool opaque) { |
696 DCHECK(task_runner_->BelongsToCurrentThread()); | 834 DCHECK(task_runner_->BelongsToCurrentThread()); |
697 client_->OnVideoOpacityChange(opaque); | 835 client_->OnVideoOpacityChange(opaque); |
698 } | 836 } |
699 | 837 |
700 } // namespace media | 838 } // namespace media |
OLD | NEW |