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

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

Issue 557333002: Revert of 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
« no previous file with comments | « media/base/mock_filters.h ('k') | media/base/pipeline_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 672 matching lines...) Expand 10 before | Expand all | Expand 10 after
683 OnError(PIPELINE_ERROR_COULD_NOT_RENDER); 683 OnError(PIPELINE_ERROR_COULD_NOT_RENDER);
684 return; 684 return;
685 } 685 }
686 686
687 base::WeakPtr<Pipeline> weak_this = weak_factory_.GetWeakPtr(); 687 base::WeakPtr<Pipeline> weak_this = weak_factory_.GetWeakPtr();
688 renderer_->Initialize( 688 renderer_->Initialize(
689 done_cb, 689 done_cb,
690 base::Bind(&Pipeline::OnUpdateStatistics, weak_this), 690 base::Bind(&Pipeline::OnUpdateStatistics, weak_this),
691 base::Bind(&Pipeline::OnRendererEnded, weak_this), 691 base::Bind(&Pipeline::OnRendererEnded, weak_this),
692 base::Bind(&Pipeline::OnError, weak_this), 692 base::Bind(&Pipeline::OnError, weak_this),
693 base::Bind(&Pipeline::BufferingStateChanged, weak_this)); 693 base::Bind(&Pipeline::BufferingStateChanged, weak_this),
694 base::Bind(&Pipeline::GetMediaDuration, base::Unretained(this)));
694 } 695 }
695 696
696 void Pipeline::ReportMetadata() { 697 void Pipeline::ReportMetadata() {
697 DCHECK(task_runner_->BelongsToCurrentThread()); 698 DCHECK(task_runner_->BelongsToCurrentThread());
698 PipelineMetadata metadata; 699 PipelineMetadata metadata;
699 metadata.has_audio = renderer_->HasAudio(); 700 metadata.has_audio = renderer_->HasAudio();
700 metadata.has_video = renderer_->HasVideo(); 701 metadata.has_video = renderer_->HasVideo();
701 metadata.timeline_offset = demuxer_->GetTimelineOffset(); 702 metadata.timeline_offset = demuxer_->GetTimelineOffset();
702 DemuxerStream* stream = demuxer_->GetStream(DemuxerStream::VIDEO); 703 DemuxerStream* stream = demuxer_->GetStream(DemuxerStream::VIDEO);
703 if (stream) { 704 if (stream) {
704 metadata.natural_size = stream->video_decoder_config().natural_size(); 705 metadata.natural_size = stream->video_decoder_config().natural_size();
705 metadata.video_rotation = stream->video_rotation(); 706 metadata.video_rotation = stream->video_rotation();
706 } 707 }
707 metadata_cb_.Run(metadata); 708 metadata_cb_.Run(metadata);
708 } 709 }
709 710
710 void Pipeline::BufferingStateChanged(BufferingState new_buffering_state) { 711 void Pipeline::BufferingStateChanged(BufferingState new_buffering_state) {
711 DVLOG(1) << __FUNCTION__ << "(" << new_buffering_state << ") "; 712 DVLOG(1) << __FUNCTION__ << "(" << new_buffering_state << ") ";
712 DCHECK(task_runner_->BelongsToCurrentThread()); 713 DCHECK(task_runner_->BelongsToCurrentThread());
713 buffering_state_cb_.Run(new_buffering_state); 714 buffering_state_cb_.Run(new_buffering_state);
714 } 715 }
715 716
716 } // namespace media 717 } // namespace media
OLDNEW
« no previous file with comments | « media/base/mock_filters.h ('k') | media/base/pipeline_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698