OLD | NEW |
---|---|
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/base/pipeline.h" | 5 #include "media/base/pipeline.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 | 8 |
9 #include "base/bind.h" | 9 #include "base/bind.h" |
10 #include "base/callback.h" | 10 #include "base/callback.h" |
11 #include "base/callback_helpers.h" | 11 #include "base/callback_helpers.h" |
12 #include "base/compiler_specific.h" | 12 #include "base/compiler_specific.h" |
13 #include "base/message_loop/message_loop.h" | 13 #include "base/message_loop/message_loop.h" |
14 #include "base/metrics/histogram.h" | 14 #include "base/metrics/histogram.h" |
15 #include "base/stl_util.h" | 15 #include "base/stl_util.h" |
16 #include "base/strings/string_number_conversions.h" | 16 #include "base/strings/string_number_conversions.h" |
17 #include "base/strings/string_util.h" | 17 #include "base/strings/string_util.h" |
18 #include "base/synchronization/condition_variable.h" | 18 #include "base/synchronization/condition_variable.h" |
19 #include "media/base/audio_decoder.h" | 19 #include "media/base/audio_decoder.h" |
20 #include "media/base/audio_renderer.h" | 20 #include "media/base/audio_renderer.h" |
21 #include "media/base/clock.h" | 21 #include "media/base/clock.h" |
22 #include "media/base/filter_collection.h" | 22 #include "media/base/filter_collection.h" |
23 #include "media/base/media_log.h" | 23 #include "media/base/media_log.h" |
24 #include "media/base/text_renderer.h" | |
24 #include "media/base/video_decoder.h" | 25 #include "media/base/video_decoder.h" |
25 #include "media/base/video_decoder_config.h" | 26 #include "media/base/video_decoder_config.h" |
26 #include "media/base/video_renderer.h" | 27 #include "media/base/video_renderer.h" |
27 | 28 |
28 using base::TimeDelta; | 29 using base::TimeDelta; |
29 | 30 |
30 namespace media { | 31 namespace media { |
31 | 32 |
32 Pipeline::Pipeline(const scoped_refptr<base::MessageLoopProxy>& message_loop, | 33 Pipeline::Pipeline(const scoped_refptr<base::MessageLoopProxy>& message_loop, |
33 MediaLog* media_log) | 34 MediaLog* media_log) |
34 : message_loop_(message_loop), | 35 : message_loop_(message_loop), |
35 media_log_(media_log), | 36 media_log_(media_log), |
36 running_(false), | 37 running_(false), |
37 did_loading_progress_(false), | 38 did_loading_progress_(false), |
38 total_bytes_(0), | 39 total_bytes_(0), |
39 natural_size_(0, 0), | 40 natural_size_(0, 0), |
40 volume_(1.0f), | 41 volume_(1.0f), |
41 playback_rate_(0.0f), | 42 playback_rate_(0.0f), |
42 clock_(new Clock(&default_tick_clock_)), | 43 clock_(new Clock(&default_tick_clock_)), |
43 waiting_for_clock_update_(false), | 44 waiting_for_clock_update_(false), |
44 status_(PIPELINE_OK), | 45 status_(PIPELINE_OK), |
45 has_audio_(false), | 46 has_audio_(false), |
46 has_video_(false), | 47 has_video_(false), |
47 state_(kCreated), | 48 state_(kCreated), |
48 audio_ended_(false), | 49 audio_ended_(false), |
49 video_ended_(false), | 50 video_ended_(false), |
51 text_ended_(false), | |
50 audio_disabled_(false), | 52 audio_disabled_(false), |
51 demuxer_(NULL), | 53 demuxer_(NULL), |
52 creation_time_(default_tick_clock_.NowTicks()) { | 54 creation_time_(default_tick_clock_.NowTicks()) { |
53 media_log_->AddEvent(media_log_->CreatePipelineStateChangedEvent(kCreated)); | 55 media_log_->AddEvent(media_log_->CreatePipelineStateChangedEvent(kCreated)); |
54 media_log_->AddEvent( | 56 media_log_->AddEvent( |
55 media_log_->CreateEvent(MediaLogEvent::PIPELINE_CREATED)); | 57 media_log_->CreateEvent(MediaLogEvent::PIPELINE_CREATED)); |
56 } | 58 } |
57 | 59 |
58 Pipeline::~Pipeline() { | 60 Pipeline::~Pipeline() { |
59 DCHECK(thread_checker_.CalledOnValidThread()) | 61 DCHECK(thread_checker_.CalledOnValidThread()) |
(...skipping 226 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
286 break; | 288 break; |
287 } | 289 } |
288 NOTREACHED() << "State has no transition: " << state_; | 290 NOTREACHED() << "State has no transition: " << state_; |
289 return state_; | 291 return state_; |
290 } | 292 } |
291 | 293 |
292 void Pipeline::OnDemuxerError(PipelineStatus error) { | 294 void Pipeline::OnDemuxerError(PipelineStatus error) { |
293 SetError(error); | 295 SetError(error); |
294 } | 296 } |
295 | 297 |
298 void Pipeline::AddTextStream(DemuxerStream* text_stream, | |
299 TextKind kind, | |
300 const std::string& label, | |
301 const std::string& language) { | |
302 base::AutoLock auto_lock(lock_); | |
acolwell GONE FROM CHROMIUM
2013/10/21 20:10:40
I don't think you need to lock here since you are
Matthew Heaney (Chromium)
2013/10/23 05:09:01
Done.
| |
303 message_loop_->PostTask(FROM_HERE, base::Bind( | |
304 &Pipeline::AddTextStreamTask, base::Unretained(this), | |
305 text_stream, kind, label, language)); | |
306 } | |
307 | |
308 void Pipeline::RemoveTextStream(DemuxerStream* text_stream) { | |
309 DCHECK(message_loop_->BelongsToCurrentThread()); | |
acolwell GONE FROM CHROMIUM
2013/10/21 20:10:40
I think you'll need to PostTask() here too since t
Matthew Heaney (Chromium)
2013/10/23 05:09:01
Done.
| |
310 if (text_renderer_) | |
311 text_renderer_->RemoveTextStream(text_stream); | |
312 } | |
313 | |
296 void Pipeline::SetError(PipelineStatus error) { | 314 void Pipeline::SetError(PipelineStatus error) { |
297 DCHECK(IsRunning()); | 315 DCHECK(IsRunning()); |
298 DCHECK_NE(PIPELINE_OK, error); | 316 DCHECK_NE(PIPELINE_OK, error); |
299 VLOG(1) << "Media pipeline error: " << error; | 317 VLOG(1) << "Media pipeline error: " << error; |
300 | 318 |
301 message_loop_->PostTask(FROM_HERE, base::Bind( | 319 message_loop_->PostTask(FROM_HERE, base::Bind( |
302 &Pipeline::ErrorChangedTask, base::Unretained(this), error)); | 320 &Pipeline::ErrorChangedTask, base::Unretained(this), error)); |
303 | 321 |
304 media_log_->AddEvent(media_log_->CreatePipelineErrorEvent(error)); | 322 media_log_->AddEvent(media_log_->CreatePipelineErrorEvent(error)); |
305 } | 323 } |
(...skipping 224 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
530 | 548 |
531 // Pause. | 549 // Pause. |
532 if (audio_renderer_) { | 550 if (audio_renderer_) { |
533 bound_fns.Push(base::Bind( | 551 bound_fns.Push(base::Bind( |
534 &AudioRenderer::Pause, base::Unretained(audio_renderer_.get()))); | 552 &AudioRenderer::Pause, base::Unretained(audio_renderer_.get()))); |
535 } | 553 } |
536 if (video_renderer_) { | 554 if (video_renderer_) { |
537 bound_fns.Push(base::Bind( | 555 bound_fns.Push(base::Bind( |
538 &VideoRenderer::Pause, base::Unretained(video_renderer_.get()))); | 556 &VideoRenderer::Pause, base::Unretained(video_renderer_.get()))); |
539 } | 557 } |
558 if (text_renderer_) { | |
559 bound_fns.Push(base::Bind( | |
560 &TextRenderer::Pause, base::Unretained(text_renderer_.get()))); | |
561 } | |
540 | 562 |
541 // Flush. | 563 // Flush. |
542 if (audio_renderer_) { | 564 if (audio_renderer_) { |
543 bound_fns.Push(base::Bind( | 565 bound_fns.Push(base::Bind( |
544 &AudioRenderer::Flush, base::Unretained(audio_renderer_.get()))); | 566 &AudioRenderer::Flush, base::Unretained(audio_renderer_.get()))); |
545 } | 567 } |
546 if (video_renderer_) { | 568 if (video_renderer_) { |
547 bound_fns.Push(base::Bind( | 569 bound_fns.Push(base::Bind( |
548 &VideoRenderer::Flush, base::Unretained(video_renderer_.get()))); | 570 &VideoRenderer::Flush, base::Unretained(video_renderer_.get()))); |
549 } | 571 } |
572 if (text_renderer_) { | |
573 bound_fns.Push(base::Bind( | |
574 &TextRenderer::Flush, base::Unretained(text_renderer_.get()))); | |
575 } | |
550 | 576 |
551 // Seek demuxer. | 577 // Seek demuxer. |
552 bound_fns.Push(base::Bind( | 578 bound_fns.Push(base::Bind( |
553 &Demuxer::Seek, base::Unretained(demuxer_), seek_timestamp)); | 579 &Demuxer::Seek, base::Unretained(demuxer_), seek_timestamp)); |
554 | 580 |
555 // Preroll renderers. | 581 // Preroll renderers. |
556 if (audio_renderer_) { | 582 if (audio_renderer_) { |
557 bound_fns.Push(base::Bind( | 583 bound_fns.Push(base::Bind( |
558 &AudioRenderer::Preroll, base::Unretained(audio_renderer_.get()), | 584 &AudioRenderer::Preroll, base::Unretained(audio_renderer_.get()), |
559 seek_timestamp)); | 585 seek_timestamp)); |
(...skipping 19 matching lines...) Expand all Loading... | |
579 if (audio_renderer_) { | 605 if (audio_renderer_) { |
580 bound_fns.Push(base::Bind( | 606 bound_fns.Push(base::Bind( |
581 &AudioRenderer::Play, base::Unretained(audio_renderer_.get()))); | 607 &AudioRenderer::Play, base::Unretained(audio_renderer_.get()))); |
582 } | 608 } |
583 | 609 |
584 if (video_renderer_) { | 610 if (video_renderer_) { |
585 bound_fns.Push(base::Bind( | 611 bound_fns.Push(base::Bind( |
586 &VideoRenderer::Play, base::Unretained(video_renderer_.get()))); | 612 &VideoRenderer::Play, base::Unretained(video_renderer_.get()))); |
587 } | 613 } |
588 | 614 |
615 if (text_renderer_) { | |
616 bound_fns.Push(base::Bind( | |
617 &TextRenderer::Play, base::Unretained(text_renderer_.get()))); | |
618 } | |
619 | |
589 pending_callbacks_ = SerialRunner::Run(bound_fns, done_cb); | 620 pending_callbacks_ = SerialRunner::Run(bound_fns, done_cb); |
590 } | 621 } |
591 | 622 |
592 void Pipeline::DoStop(const PipelineStatusCB& done_cb) { | 623 void Pipeline::DoStop(const PipelineStatusCB& done_cb) { |
593 DCHECK(message_loop_->BelongsToCurrentThread()); | 624 DCHECK(message_loop_->BelongsToCurrentThread()); |
594 DCHECK(!pending_callbacks_.get()); | 625 DCHECK(!pending_callbacks_.get()); |
595 SerialRunner::Queue bound_fns; | 626 SerialRunner::Queue bound_fns; |
596 | 627 |
597 if (demuxer_) { | 628 if (demuxer_) { |
598 bound_fns.Push(base::Bind( | 629 bound_fns.Push(base::Bind( |
599 &Demuxer::Stop, base::Unretained(demuxer_))); | 630 &Demuxer::Stop, base::Unretained(demuxer_))); |
600 } | 631 } |
601 | 632 |
602 if (audio_renderer_) { | 633 if (audio_renderer_) { |
603 bound_fns.Push(base::Bind( | 634 bound_fns.Push(base::Bind( |
604 &AudioRenderer::Stop, base::Unretained(audio_renderer_.get()))); | 635 &AudioRenderer::Stop, base::Unretained(audio_renderer_.get()))); |
605 } | 636 } |
606 | 637 |
607 if (video_renderer_) { | 638 if (video_renderer_) { |
608 bound_fns.Push(base::Bind( | 639 bound_fns.Push(base::Bind( |
609 &VideoRenderer::Stop, base::Unretained(video_renderer_.get()))); | 640 &VideoRenderer::Stop, base::Unretained(video_renderer_.get()))); |
610 } | 641 } |
611 | 642 |
643 if (text_renderer_) { | |
644 bound_fns.Push(base::Bind( | |
645 &TextRenderer::Stop, base::Unretained(text_renderer_.get()))); | |
646 } | |
647 | |
612 pending_callbacks_ = SerialRunner::Run(bound_fns, done_cb); | 648 pending_callbacks_ = SerialRunner::Run(bound_fns, done_cb); |
613 } | 649 } |
614 | 650 |
615 void Pipeline::OnStopCompleted(PipelineStatus status) { | 651 void Pipeline::OnStopCompleted(PipelineStatus status) { |
616 DCHECK(message_loop_->BelongsToCurrentThread()); | 652 DCHECK(message_loop_->BelongsToCurrentThread()); |
617 DCHECK_EQ(state_, kStopping); | 653 DCHECK_EQ(state_, kStopping); |
618 { | 654 { |
619 base::AutoLock l(lock_); | 655 base::AutoLock l(lock_); |
620 running_ = false; | 656 running_ = false; |
621 } | 657 } |
622 | 658 |
623 SetState(kStopped); | 659 SetState(kStopped); |
624 pending_callbacks_.reset(); | 660 pending_callbacks_.reset(); |
625 filter_collection_.reset(); | 661 filter_collection_.reset(); |
626 audio_renderer_.reset(); | 662 audio_renderer_.reset(); |
627 video_renderer_.reset(); | 663 video_renderer_.reset(); |
664 text_renderer_.reset(); | |
628 demuxer_ = NULL; | 665 demuxer_ = NULL; |
629 | 666 |
630 // If we stop during initialization/seeking we want to run |seek_cb_| | 667 // If we stop during initialization/seeking we want to run |seek_cb_| |
631 // followed by |stop_cb_| so we don't leave outstanding callbacks around. | 668 // followed by |stop_cb_| so we don't leave outstanding callbacks around. |
632 if (!seek_cb_.is_null()) { | 669 if (!seek_cb_.is_null()) { |
633 base::ResetAndReturn(&seek_cb_).Run(status_); | 670 base::ResetAndReturn(&seek_cb_).Run(status_); |
634 error_cb_.Reset(); | 671 error_cb_.Reset(); |
635 } | 672 } |
636 if (!stop_cb_.is_null()) { | 673 if (!stop_cb_.is_null()) { |
637 error_cb_.Reset(); | 674 error_cb_.Reset(); |
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
678 media_log_->AddEvent(media_log_->CreateEvent(MediaLogEvent::AUDIO_ENDED)); | 715 media_log_->AddEvent(media_log_->CreateEvent(MediaLogEvent::AUDIO_ENDED)); |
679 } | 716 } |
680 | 717 |
681 void Pipeline::OnVideoRendererEnded() { | 718 void Pipeline::OnVideoRendererEnded() { |
682 // Force post to process ended messages after current execution frame. | 719 // Force post to process ended messages after current execution frame. |
683 message_loop_->PostTask(FROM_HERE, base::Bind( | 720 message_loop_->PostTask(FROM_HERE, base::Bind( |
684 &Pipeline::DoVideoRendererEnded, base::Unretained(this))); | 721 &Pipeline::DoVideoRendererEnded, base::Unretained(this))); |
685 media_log_->AddEvent(media_log_->CreateEvent(MediaLogEvent::VIDEO_ENDED)); | 722 media_log_->AddEvent(media_log_->CreateEvent(MediaLogEvent::VIDEO_ENDED)); |
686 } | 723 } |
687 | 724 |
725 void Pipeline::OnTextRendererEnded() { | |
726 // Force post to process ended messages after current execution frame. | |
727 message_loop_->PostTask(FROM_HERE, base::Bind( | |
728 &Pipeline::DoTextRendererEnded, base::Unretained(this))); | |
729 media_log_->AddEvent(media_log_->CreateEvent(MediaLogEvent::TEXT_ENDED)); | |
730 } | |
731 | |
688 // Called from any thread. | 732 // Called from any thread. |
689 void Pipeline::OnUpdateStatistics(const PipelineStatistics& stats) { | 733 void Pipeline::OnUpdateStatistics(const PipelineStatistics& stats) { |
690 base::AutoLock auto_lock(lock_); | 734 base::AutoLock auto_lock(lock_); |
691 statistics_.audio_bytes_decoded += stats.audio_bytes_decoded; | 735 statistics_.audio_bytes_decoded += stats.audio_bytes_decoded; |
692 statistics_.video_bytes_decoded += stats.video_bytes_decoded; | 736 statistics_.video_bytes_decoded += stats.video_bytes_decoded; |
693 statistics_.video_frames_decoded += stats.video_frames_decoded; | 737 statistics_.video_frames_decoded += stats.video_frames_decoded; |
694 statistics_.video_frames_dropped += stats.video_frames_dropped; | 738 statistics_.video_frames_dropped += stats.video_frames_dropped; |
695 } | 739 } |
696 | 740 |
697 void Pipeline::StartTask(scoped_ptr<FilterCollection> filter_collection, | 741 void Pipeline::StartTask(scoped_ptr<FilterCollection> filter_collection, |
698 const base::Closure& ended_cb, | 742 const base::Closure& ended_cb, |
699 const PipelineStatusCB& error_cb, | 743 const PipelineStatusCB& error_cb, |
700 const PipelineStatusCB& seek_cb, | 744 const PipelineStatusCB& seek_cb, |
701 const BufferingStateCB& buffering_state_cb, | 745 const BufferingStateCB& buffering_state_cb, |
702 const base::Closure& duration_change_cb) { | 746 const base::Closure& duration_change_cb) { |
703 DCHECK(message_loop_->BelongsToCurrentThread()); | 747 DCHECK(message_loop_->BelongsToCurrentThread()); |
704 CHECK_EQ(kCreated, state_) | 748 CHECK_EQ(kCreated, state_) |
705 << "Media pipeline cannot be started more than once"; | 749 << "Media pipeline cannot be started more than once"; |
706 | 750 |
707 filter_collection_ = filter_collection.Pass(); | 751 filter_collection_ = filter_collection.Pass(); |
708 ended_cb_ = ended_cb; | 752 ended_cb_ = ended_cb; |
709 error_cb_ = error_cb; | 753 error_cb_ = error_cb; |
710 seek_cb_ = seek_cb; | 754 seek_cb_ = seek_cb; |
711 buffering_state_cb_ = buffering_state_cb; | 755 buffering_state_cb_ = buffering_state_cb; |
712 duration_change_cb_ = duration_change_cb; | 756 duration_change_cb_ = duration_change_cb; |
713 | 757 |
758 text_renderer_ = filter_collection_->GetTextRenderer(); | |
759 | |
760 if (text_renderer_) { | |
761 text_renderer_->Initialize( | |
762 base::Bind(&Pipeline::OnTextRendererEnded, base::Unretained(this))); | |
763 } | |
764 | |
714 StateTransitionTask(PIPELINE_OK); | 765 StateTransitionTask(PIPELINE_OK); |
715 } | 766 } |
716 | 767 |
717 void Pipeline::StopTask(const base::Closure& stop_cb) { | 768 void Pipeline::StopTask(const base::Closure& stop_cb) { |
718 DCHECK(message_loop_->BelongsToCurrentThread()); | 769 DCHECK(message_loop_->BelongsToCurrentThread()); |
719 DCHECK(stop_cb_.is_null()); | 770 DCHECK(stop_cb_.is_null()); |
720 | 771 |
721 if (state_ == kStopped) { | 772 if (state_ == kStopped) { |
722 stop_cb.Run(); | 773 stop_cb.Run(); |
723 return; | 774 return; |
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
793 return; | 844 return; |
794 } | 845 } |
795 | 846 |
796 DCHECK(seek_cb_.is_null()); | 847 DCHECK(seek_cb_.is_null()); |
797 | 848 |
798 SetState(kSeeking); | 849 SetState(kSeeking); |
799 base::TimeDelta seek_timestamp = std::max(time, demuxer_->GetStartTime()); | 850 base::TimeDelta seek_timestamp = std::max(time, demuxer_->GetStartTime()); |
800 seek_cb_ = seek_cb; | 851 seek_cb_ = seek_cb; |
801 audio_ended_ = false; | 852 audio_ended_ = false; |
802 video_ended_ = false; | 853 video_ended_ = false; |
854 text_ended_ = false; | |
803 | 855 |
804 // Kick off seeking! | 856 // Kick off seeking! |
805 { | 857 { |
806 base::AutoLock auto_lock(lock_); | 858 base::AutoLock auto_lock(lock_); |
807 if (clock_->IsPlaying()) | 859 if (clock_->IsPlaying()) |
808 clock_->Pause(); | 860 clock_->Pause(); |
809 clock_->SetTime(seek_timestamp, seek_timestamp); | 861 clock_->SetTime(seek_timestamp, seek_timestamp); |
810 } | 862 } |
811 DoSeek(seek_timestamp, base::Bind( | 863 DoSeek(seek_timestamp, base::Bind( |
812 &Pipeline::OnStateTransition, base::Unretained(this))); | 864 &Pipeline::OnStateTransition, base::Unretained(this))); |
(...skipping 23 matching lines...) Expand all Loading... | |
836 | 888 |
837 if (state_ != kStarted) | 889 if (state_ != kStarted) |
838 return; | 890 return; |
839 | 891 |
840 DCHECK(!video_ended_); | 892 DCHECK(!video_ended_); |
841 video_ended_ = true; | 893 video_ended_ = true; |
842 | 894 |
843 RunEndedCallbackIfNeeded(); | 895 RunEndedCallbackIfNeeded(); |
844 } | 896 } |
845 | 897 |
898 void Pipeline::DoTextRendererEnded() { | |
899 DCHECK(message_loop_->BelongsToCurrentThread()); | |
900 | |
901 if (state_ != kStarted) | |
902 return; | |
903 | |
904 DCHECK(!text_ended_); | |
905 text_ended_ = true; | |
906 | |
907 RunEndedCallbackIfNeeded(); | |
908 } | |
909 | |
846 void Pipeline::RunEndedCallbackIfNeeded() { | 910 void Pipeline::RunEndedCallbackIfNeeded() { |
847 DCHECK(message_loop_->BelongsToCurrentThread()); | 911 DCHECK(message_loop_->BelongsToCurrentThread()); |
848 | 912 |
849 if (audio_renderer_ && !audio_ended_ && !audio_disabled_) | 913 if (audio_renderer_ && !audio_ended_ && !audio_disabled_) |
850 return; | 914 return; |
851 | 915 |
852 if (video_renderer_ && !video_ended_) | 916 if (video_renderer_ && !video_ended_) |
853 return; | 917 return; |
854 | 918 |
919 if (text_renderer_ && text_renderer_->HasTracks() && !text_ended_) | |
920 return; | |
921 | |
855 { | 922 { |
856 base::AutoLock auto_lock(lock_); | 923 base::AutoLock auto_lock(lock_); |
857 clock_->EndOfStream(); | 924 clock_->EndOfStream(); |
858 } | 925 } |
859 | 926 |
860 DCHECK_EQ(status_, PIPELINE_OK); | 927 DCHECK_EQ(status_, PIPELINE_OK); |
861 ended_cb_.Run(); | 928 ended_cb_.Run(); |
862 } | 929 } |
863 | 930 |
864 void Pipeline::AudioDisabledTask() { | 931 void Pipeline::AudioDisabledTask() { |
865 DCHECK(message_loop_->BelongsToCurrentThread()); | 932 DCHECK(message_loop_->BelongsToCurrentThread()); |
866 | 933 |
867 base::AutoLock auto_lock(lock_); | 934 base::AutoLock auto_lock(lock_); |
868 has_audio_ = false; | 935 has_audio_ = false; |
869 audio_disabled_ = true; | 936 audio_disabled_ = true; |
870 | 937 |
871 // Notify our demuxer that we're no longer rendering audio. | 938 // Notify our demuxer that we're no longer rendering audio. |
872 demuxer_->OnAudioRendererDisabled(); | 939 demuxer_->OnAudioRendererDisabled(); |
873 | 940 |
874 // Start clock since there is no more audio to trigger clock updates. | 941 // Start clock since there is no more audio to trigger clock updates. |
875 clock_->SetMaxTime(clock_->Duration()); | 942 clock_->SetMaxTime(clock_->Duration()); |
876 StartClockIfWaitingForTimeUpdate_Locked(); | 943 StartClockIfWaitingForTimeUpdate_Locked(); |
877 } | 944 } |
878 | 945 |
946 void Pipeline::AddTextStreamTask(DemuxerStream* text_stream, | |
947 TextKind kind, | |
948 const std::string& label, | |
949 const std::string& language) { | |
950 DCHECK(message_loop_->BelongsToCurrentThread()); | |
951 text_renderer_->AddTextStream(text_stream, kind, label, language); | |
952 } | |
953 | |
879 void Pipeline::InitializeDemuxer(const PipelineStatusCB& done_cb) { | 954 void Pipeline::InitializeDemuxer(const PipelineStatusCB& done_cb) { |
880 DCHECK(message_loop_->BelongsToCurrentThread()); | 955 DCHECK(message_loop_->BelongsToCurrentThread()); |
881 | 956 |
882 demuxer_ = filter_collection_->GetDemuxer(); | 957 demuxer_ = filter_collection_->GetDemuxer(); |
883 demuxer_->Initialize(this, done_cb); | 958 demuxer_->Initialize(this, done_cb); |
884 } | 959 } |
885 | 960 |
886 void Pipeline::InitializeAudioRenderer(const PipelineStatusCB& done_cb) { | 961 void Pipeline::InitializeAudioRenderer(const PipelineStatusCB& done_cb) { |
887 DCHECK(message_loop_->BelongsToCurrentThread()); | 962 DCHECK(message_loop_->BelongsToCurrentThread()); |
888 | 963 |
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
940 void Pipeline::StartClockIfWaitingForTimeUpdate_Locked() { | 1015 void Pipeline::StartClockIfWaitingForTimeUpdate_Locked() { |
941 lock_.AssertAcquired(); | 1016 lock_.AssertAcquired(); |
942 if (!waiting_for_clock_update_) | 1017 if (!waiting_for_clock_update_) |
943 return; | 1018 return; |
944 | 1019 |
945 waiting_for_clock_update_ = false; | 1020 waiting_for_clock_update_ = false; |
946 clock_->Play(); | 1021 clock_->Play(); |
947 } | 1022 } |
948 | 1023 |
949 } // namespace media | 1024 } // namespace media |
OLD | NEW |