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

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

Issue 1008463002: Fix MSE GC, make it less aggressive, more spec-compliant (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Added new test case: GarbageCollection_SaveDataAtPlaybackPosition Created 5 years, 6 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 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/renderers/renderer_impl.h" 5 #include "media/renderers/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"
11 #include "base/compiler_specific.h" 11 #include "base/compiler_specific.h"
12 #include "base/location.h" 12 #include "base/location.h"
13 #include "base/single_thread_task_runner.h" 13 #include "base/single_thread_task_runner.h"
14 #include "base/strings/string_number_conversions.h" 14 #include "base/strings/string_number_conversions.h"
15 #include "media/base/audio_renderer.h" 15 #include "media/base/audio_renderer.h"
16 #include "media/base/bind_to_current_loop.h" 16 #include "media/base/bind_to_current_loop.h"
17 #include "media/base/buffers.h"
17 #include "media/base/demuxer_stream_provider.h" 18 #include "media/base/demuxer_stream_provider.h"
18 #include "media/base/media_switches.h" 19 #include "media/base/media_switches.h"
19 #include "media/base/time_source.h" 20 #include "media/base/time_source.h"
20 #include "media/base/video_renderer.h" 21 #include "media/base/video_renderer.h"
21 #include "media/base/wall_clock_time_source.h" 22 #include "media/base/wall_clock_time_source.h"
22 23
23 namespace media { 24 namespace media {
24 25
25 // See |video_underflow_threshold_|. 26 // See |video_underflow_threshold_|.
26 static const int kDefaultVideoUnderflowThresholdMs = 3000; 27 static const int kDefaultVideoUnderflowThresholdMs = 3000;
(...skipping 164 matching lines...) Expand 10 before | Expand all | Expand 10 after
191 DVLOG(1) << __FUNCTION__; 192 DVLOG(1) << __FUNCTION__;
192 DCHECK(task_runner_->BelongsToCurrentThread()); 193 DCHECK(task_runner_->BelongsToCurrentThread());
193 194
194 if (audio_renderer_) 195 if (audio_renderer_)
195 audio_renderer_->SetVolume(volume); 196 audio_renderer_->SetVolume(volume);
196 } 197 }
197 198
198 base::TimeDelta RendererImpl::GetMediaTime() { 199 base::TimeDelta RendererImpl::GetMediaTime() {
199 // No BelongsToCurrentThread() checking because this can be called from other 200 // No BelongsToCurrentThread() checking because this can be called from other
200 // threads. 201 // threads.
202 if (!time_source_)
203 return kNoTimestamp();
201 return time_source_->CurrentMediaTime(); 204 return time_source_->CurrentMediaTime();
202 } 205 }
203 206
204 bool RendererImpl::HasAudio() { 207 bool RendererImpl::HasAudio() {
205 DCHECK(task_runner_->BelongsToCurrentThread()); 208 DCHECK(task_runner_->BelongsToCurrentThread());
206 return audio_renderer_ != NULL; 209 return audio_renderer_ != NULL;
207 } 210 }
208 211
209 bool RendererImpl::HasVideo() { 212 bool RendererImpl::HasVideo() {
210 DCHECK(task_runner_->BelongsToCurrentThread()); 213 DCHECK(task_runner_->BelongsToCurrentThread());
(...skipping 426 matching lines...) Expand 10 before | Expand all | Expand 10 after
637 } 640 }
638 641
639 // After OnError() returns, the pipeline may destroy |this|. 642 // After OnError() returns, the pipeline may destroy |this|.
640 base::ResetAndReturn(&error_cb_).Run(error); 643 base::ResetAndReturn(&error_cb_).Run(error);
641 644
642 if (!flush_cb_.is_null()) 645 if (!flush_cb_.is_null())
643 base::ResetAndReturn(&flush_cb_).Run(); 646 base::ResetAndReturn(&flush_cb_).Run();
644 } 647 }
645 648
646 } // namespace media 649 } // namespace media
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698