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

Side by Side Diff: media/filters/renderer_impl.cc

Issue 568113003: Switch back to using VideoRenderer::StartPlayingFrom(). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix + rebase 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/video_renderer.h ('k') | media/filters/renderer_impl_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 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/filters/renderer_impl.h" 5 #include "media/filters/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/compiler_specific.h" 10 #include "base/compiler_specific.h"
(...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after
97 void RendererImpl::StartPlayingFrom(base::TimeDelta time) { 97 void RendererImpl::StartPlayingFrom(base::TimeDelta time) {
98 DVLOG(1) << __FUNCTION__; 98 DVLOG(1) << __FUNCTION__;
99 DCHECK(task_runner_->BelongsToCurrentThread()); 99 DCHECK(task_runner_->BelongsToCurrentThread());
100 DCHECK_EQ(state_, STATE_PLAYING) << state_; 100 DCHECK_EQ(state_, STATE_PLAYING) << state_;
101 101
102 time_source_->SetMediaTime(time); 102 time_source_->SetMediaTime(time);
103 103
104 if (audio_renderer_) 104 if (audio_renderer_)
105 audio_renderer_->StartPlaying(); 105 audio_renderer_->StartPlaying();
106 if (video_renderer_) 106 if (video_renderer_)
107 video_renderer_->StartPlaying(); 107 video_renderer_->StartPlayingFrom(time);
108 } 108 }
109 109
110 void RendererImpl::SetPlaybackRate(float playback_rate) { 110 void RendererImpl::SetPlaybackRate(float playback_rate) {
111 DVLOG(1) << __FUNCTION__ << "(" << playback_rate << ")"; 111 DVLOG(1) << __FUNCTION__ << "(" << playback_rate << ")";
112 DCHECK(task_runner_->BelongsToCurrentThread()); 112 DCHECK(task_runner_->BelongsToCurrentThread());
113 113
114 // Playback rate changes are only carried out while playing. 114 // Playback rate changes are only carried out while playing.
115 if (state_ != STATE_PLAYING) 115 if (state_ != STATE_PLAYING)
116 return; 116 return;
117 117
(...skipping 378 matching lines...) Expand 10 before | Expand all | Expand 10 after
496 DCHECK(task_runner_->BelongsToCurrentThread()); 496 DCHECK(task_runner_->BelongsToCurrentThread());
497 497
498 if (!init_cb_.is_null()) 498 if (!init_cb_.is_null())
499 base::ResetAndReturn(&init_cb_).Run(); 499 base::ResetAndReturn(&init_cb_).Run();
500 500
501 if (!flush_cb_.is_null()) 501 if (!flush_cb_.is_null())
502 base::ResetAndReturn(&flush_cb_).Run(); 502 base::ResetAndReturn(&flush_cb_).Run();
503 } 503 }
504 504
505 } // namespace media 505 } // namespace media
OLDNEW
« no previous file with comments | « media/base/video_renderer.h ('k') | media/filters/renderer_impl_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698