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

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

Issue 1915443003: Replace scoped_ptr with std::unique_ptr in //media. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@scopedptr-media-base
Patch Set: scopedptr-media: rebase Created 4 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.h ('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> 7 #include <utility>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/callback.h" 10 #include "base/callback.h"
(...skipping 13 matching lines...) Expand all
24 #include "media/base/video_renderer.h" 24 #include "media/base/video_renderer.h"
25 #include "media/base/wall_clock_time_source.h" 25 #include "media/base/wall_clock_time_source.h"
26 26
27 namespace media { 27 namespace media {
28 28
29 // See |video_underflow_threshold_|. 29 // See |video_underflow_threshold_|.
30 static const int kDefaultVideoUnderflowThresholdMs = 3000; 30 static const int kDefaultVideoUnderflowThresholdMs = 3000;
31 31
32 RendererImpl::RendererImpl( 32 RendererImpl::RendererImpl(
33 const scoped_refptr<base::SingleThreadTaskRunner>& task_runner, 33 const scoped_refptr<base::SingleThreadTaskRunner>& task_runner,
34 scoped_ptr<AudioRenderer> audio_renderer, 34 std::unique_ptr<AudioRenderer> audio_renderer,
35 scoped_ptr<VideoRenderer> video_renderer) 35 std::unique_ptr<VideoRenderer> video_renderer)
36 : state_(STATE_UNINITIALIZED), 36 : state_(STATE_UNINITIALIZED),
37 task_runner_(task_runner), 37 task_runner_(task_runner),
38 audio_renderer_(std::move(audio_renderer)), 38 audio_renderer_(std::move(audio_renderer)),
39 video_renderer_(std::move(video_renderer)), 39 video_renderer_(std::move(video_renderer)),
40 time_source_(NULL), 40 time_source_(NULL),
41 time_ticking_(false), 41 time_ticking_(false),
42 playback_rate_(0.0), 42 playback_rate_(0.0),
43 audio_buffering_state_(BUFFERING_HAVE_NOTHING), 43 audio_buffering_state_(BUFFERING_HAVE_NOTHING),
44 video_buffering_state_(BUFFERING_HAVE_NOTHING), 44 video_buffering_state_(BUFFERING_HAVE_NOTHING),
45 audio_ended_(false), 45 audio_ended_(false),
(...skipping 614 matching lines...) Expand 10 before | Expand all | Expand 10 after
660 } 660 }
661 661
662 // After OnError() returns, the pipeline may destroy |this|. 662 // After OnError() returns, the pipeline may destroy |this|.
663 base::ResetAndReturn(&error_cb_).Run(error); 663 base::ResetAndReturn(&error_cb_).Run(error);
664 664
665 if (!flush_cb_.is_null()) 665 if (!flush_cb_.is_null())
666 base::ResetAndReturn(&flush_cb_).Run(); 666 base::ResetAndReturn(&flush_cb_).Run();
667 } 667 }
668 668
669 } // namespace media 669 } // namespace media
OLDNEW
« no previous file with comments | « media/renderers/renderer_impl.h ('k') | media/renderers/renderer_impl_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698