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

Side by Side Diff: media/renderers/video_renderer_impl.cc

Issue 1148473003: Fix deferred video underflow if audio underflows first. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Remove CHECK. Created 5 years, 7 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/renderers/renderer_impl_unittest.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/video_renderer_impl.h" 5 #include "media/renderers/video_renderer_impl.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/callback.h" 8 #include "base/callback.h"
9 #include "base/callback_helpers.h" 9 #include "base/callback_helpers.h"
10 #include "base/command_line.h" 10 #include "base/command_line.h"
(...skipping 683 matching lines...) Expand 10 before | Expand all | Expand 10 after
694 // we ensure that frames_queued() doesn't get excessive. 694 // we ensure that frames_queued() doesn't get excessive.
695 return algorithm_->EffectiveFramesQueued() >= kMaxVideoFrames || 695 return algorithm_->EffectiveFramesQueued() >= kMaxVideoFrames ||
696 algorithm_->frames_queued() >= 3 * kMaxVideoFrames; 696 algorithm_->frames_queued() >= 3 * kMaxVideoFrames;
697 } 697 }
698 698
699 return ready_frames_.size() >= kMaxVideoFrames; 699 return ready_frames_.size() >= kMaxVideoFrames;
700 } 700 }
701 701
702 void VideoRendererImpl::StartSink() { 702 void VideoRendererImpl::StartSink() {
703 DCHECK(task_runner_->BelongsToCurrentThread()); 703 DCHECK(task_runner_->BelongsToCurrentThread());
704 CHECK_GT(algorithm_->frames_queued(), 0u); 704 DCHECK_GT(algorithm_->frames_queued(), 0u);
705 sink_->Start(this); 705 sink_->Start(this);
706 sink_started_ = true; 706 sink_started_ = true;
707 was_background_rendering_ = false; 707 was_background_rendering_ = false;
708 } 708 }
709 709
710 void VideoRendererImpl::StopSink() { 710 void VideoRendererImpl::StopSink() {
711 DCHECK(task_runner_->BelongsToCurrentThread()); 711 DCHECK(task_runner_->BelongsToCurrentThread());
712 sink_->Stop(); 712 sink_->Stop();
713 sink_started_ = false; 713 sink_started_ = false;
714 was_background_rendering_ = false; 714 was_background_rendering_ = false;
(...skipping 28 matching lines...) Expand all
743 base::TimeTicks VideoRendererImpl::ConvertMediaTimestamp( 743 base::TimeTicks VideoRendererImpl::ConvertMediaTimestamp(
744 base::TimeDelta media_time) { 744 base::TimeDelta media_time) {
745 std::vector<base::TimeDelta> media_times(1, media_time); 745 std::vector<base::TimeDelta> media_times(1, media_time);
746 std::vector<base::TimeTicks> wall_clock_times; 746 std::vector<base::TimeTicks> wall_clock_times;
747 if (!wall_clock_time_cb_.Run(media_times, &wall_clock_times)) 747 if (!wall_clock_time_cb_.Run(media_times, &wall_clock_times))
748 return base::TimeTicks(); 748 return base::TimeTicks();
749 return wall_clock_times[0]; 749 return wall_clock_times[0];
750 } 750 }
751 751
752 } // namespace media 752 } // namespace media
OLDNEW
« no previous file with comments | « media/renderers/renderer_impl_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698