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

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

Issue 1544313002: Convert Pass()→std::move() in //media (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 12 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/default_renderer_factory.cc ('k') | media/renderers/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/renderers/renderer_impl.h" 5 #include "media/renderers/renderer_impl.h"
6 6
7 #include <utility>
8
7 #include "base/bind.h" 9 #include "base/bind.h"
8 #include "base/callback.h" 10 #include "base/callback.h"
9 #include "base/callback_helpers.h" 11 #include "base/callback_helpers.h"
10 #include "base/command_line.h" 12 #include "base/command_line.h"
11 #include "base/compiler_specific.h" 13 #include "base/compiler_specific.h"
12 #include "base/location.h" 14 #include "base/location.h"
13 #include "base/single_thread_task_runner.h" 15 #include "base/single_thread_task_runner.h"
14 #include "base/strings/string_number_conversions.h" 16 #include "base/strings/string_number_conversions.h"
15 #include "media/base/audio_renderer.h" 17 #include "media/base/audio_renderer.h"
16 #include "media/base/bind_to_current_loop.h" 18 #include "media/base/bind_to_current_loop.h"
17 #include "media/base/demuxer_stream_provider.h" 19 #include "media/base/demuxer_stream_provider.h"
18 #include "media/base/media_switches.h" 20 #include "media/base/media_switches.h"
19 #include "media/base/time_source.h" 21 #include "media/base/time_source.h"
20 #include "media/base/video_renderer.h" 22 #include "media/base/video_renderer.h"
21 #include "media/base/wall_clock_time_source.h" 23 #include "media/base/wall_clock_time_source.h"
22 24
23 namespace media { 25 namespace media {
24 26
25 // See |video_underflow_threshold_|. 27 // See |video_underflow_threshold_|.
26 static const int kDefaultVideoUnderflowThresholdMs = 3000; 28 static const int kDefaultVideoUnderflowThresholdMs = 3000;
27 29
28 RendererImpl::RendererImpl( 30 RendererImpl::RendererImpl(
29 const scoped_refptr<base::SingleThreadTaskRunner>& task_runner, 31 const scoped_refptr<base::SingleThreadTaskRunner>& task_runner,
30 scoped_ptr<AudioRenderer> audio_renderer, 32 scoped_ptr<AudioRenderer> audio_renderer,
31 scoped_ptr<VideoRenderer> video_renderer) 33 scoped_ptr<VideoRenderer> video_renderer)
32 : state_(STATE_UNINITIALIZED), 34 : state_(STATE_UNINITIALIZED),
33 task_runner_(task_runner), 35 task_runner_(task_runner),
34 audio_renderer_(audio_renderer.Pass()), 36 audio_renderer_(std::move(audio_renderer)),
35 video_renderer_(video_renderer.Pass()), 37 video_renderer_(std::move(video_renderer)),
36 time_source_(NULL), 38 time_source_(NULL),
37 time_ticking_(false), 39 time_ticking_(false),
38 playback_rate_(0.0), 40 playback_rate_(0.0),
39 audio_buffering_state_(BUFFERING_HAVE_NOTHING), 41 audio_buffering_state_(BUFFERING_HAVE_NOTHING),
40 video_buffering_state_(BUFFERING_HAVE_NOTHING), 42 video_buffering_state_(BUFFERING_HAVE_NOTHING),
41 audio_ended_(false), 43 audio_ended_(false),
42 video_ended_(false), 44 video_ended_(false),
43 cdm_context_(nullptr), 45 cdm_context_(nullptr),
44 underflow_disabled_for_testing_(false), 46 underflow_disabled_for_testing_(false),
45 clockless_video_playback_enabled_for_testing_(false), 47 clockless_video_playback_enabled_for_testing_(false),
(...skipping 595 matching lines...) Expand 10 before | Expand all | Expand 10 after
641 } 643 }
642 644
643 // After OnError() returns, the pipeline may destroy |this|. 645 // After OnError() returns, the pipeline may destroy |this|.
644 base::ResetAndReturn(&error_cb_).Run(error); 646 base::ResetAndReturn(&error_cb_).Run(error);
645 647
646 if (!flush_cb_.is_null()) 648 if (!flush_cb_.is_null())
647 base::ResetAndReturn(&flush_cb_).Run(); 649 base::ResetAndReturn(&flush_cb_).Run();
648 } 650 }
649 651
650 } // namespace media 652 } // namespace media
OLDNEW
« no previous file with comments | « media/renderers/default_renderer_factory.cc ('k') | media/renderers/renderer_impl_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698