Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(645)

Side by Side Diff: media/base/pipeline.cc

Issue 534073002: Switch to using media::TimeSource inside media::RendererImpl. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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"
(...skipping 663 matching lines...) Expand 10 before | Expand all | Expand 10 after
674 OnError(PIPELINE_ERROR_COULD_NOT_RENDER); 674 OnError(PIPELINE_ERROR_COULD_NOT_RENDER);
675 return; 675 return;
676 } 676 }
677 677
678 base::WeakPtr<Pipeline> weak_this = weak_factory_.GetWeakPtr(); 678 base::WeakPtr<Pipeline> weak_this = weak_factory_.GetWeakPtr();
679 renderer_->Initialize( 679 renderer_->Initialize(
680 done_cb, 680 done_cb,
681 base::Bind(&Pipeline::OnUpdateStatistics, weak_this), 681 base::Bind(&Pipeline::OnUpdateStatistics, weak_this),
682 base::Bind(&Pipeline::OnRendererEnded, weak_this), 682 base::Bind(&Pipeline::OnRendererEnded, weak_this),
683 base::Bind(&Pipeline::OnError, weak_this), 683 base::Bind(&Pipeline::OnError, weak_this),
684 base::Bind(&Pipeline::BufferingStateChanged, weak_this), 684 base::Bind(&Pipeline::BufferingStateChanged, weak_this));
685 base::Bind(&Pipeline::GetMediaDuration, base::Unretained(this)));
686 } 685 }
687 686
688 void Pipeline::ReportMetadata() { 687 void Pipeline::ReportMetadata() {
689 DCHECK(task_runner_->BelongsToCurrentThread()); 688 DCHECK(task_runner_->BelongsToCurrentThread());
690 PipelineMetadata metadata; 689 PipelineMetadata metadata;
691 metadata.has_audio = renderer_->HasAudio(); 690 metadata.has_audio = renderer_->HasAudio();
692 metadata.has_video = renderer_->HasVideo(); 691 metadata.has_video = renderer_->HasVideo();
693 metadata.timeline_offset = demuxer_->GetTimelineOffset(); 692 metadata.timeline_offset = demuxer_->GetTimelineOffset();
694 DemuxerStream* stream = demuxer_->GetStream(DemuxerStream::VIDEO); 693 DemuxerStream* stream = demuxer_->GetStream(DemuxerStream::VIDEO);
695 if (stream) { 694 if (stream) {
696 metadata.natural_size = stream->video_decoder_config().natural_size(); 695 metadata.natural_size = stream->video_decoder_config().natural_size();
697 metadata.video_rotation = stream->video_rotation(); 696 metadata.video_rotation = stream->video_rotation();
698 } 697 }
699 metadata_cb_.Run(metadata); 698 metadata_cb_.Run(metadata);
700 } 699 }
701 700
702 void Pipeline::BufferingStateChanged(BufferingState new_buffering_state) { 701 void Pipeline::BufferingStateChanged(BufferingState new_buffering_state) {
703 DVLOG(1) << __FUNCTION__ << "(" << new_buffering_state << ") "; 702 DVLOG(1) << __FUNCTION__ << "(" << new_buffering_state << ") ";
704 DCHECK(task_runner_->BelongsToCurrentThread()); 703 DCHECK(task_runner_->BelongsToCurrentThread());
705 buffering_state_cb_.Run(new_buffering_state); 704 buffering_state_cb_.Run(new_buffering_state);
706 } 705 }
707 706
708 } // namespace media 707 } // namespace media
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698