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

Side by Side Diff: chromecast/media/cma/backend/alsa/stream_mixer_alsa_input_impl.h

Issue 1875623002: Convert //chromecast from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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 #ifndef CHROMECAST_MEDIA_CMA_BACKEND_ALSA_STREAM_MIXER_ALSA_INPUT_IMPL_H_ 5 #ifndef CHROMECAST_MEDIA_CMA_BACKEND_ALSA_STREAM_MIXER_ALSA_INPUT_IMPL_H_
6 #define CHROMECAST_MEDIA_CMA_BACKEND_ALSA_STREAM_MIXER_ALSA_INPUT_IMPL_H_ 6 #define CHROMECAST_MEDIA_CMA_BACKEND_ALSA_STREAM_MIXER_ALSA_INPUT_IMPL_H_
7 7
8 #include <deque> 8 #include <deque>
9 #include <memory>
9 10
10 #include "base/macros.h" 11 #include "base/macros.h"
11 #include "base/memory/ref_counted.h" 12 #include "base/memory/ref_counted.h"
12 #include "base/memory/scoped_ptr.h"
13 #include "base/memory/weak_ptr.h" 13 #include "base/memory/weak_ptr.h"
14 #include "base/synchronization/lock.h" 14 #include "base/synchronization/lock.h"
15 #include "chromecast/media/cma/backend/alsa/media_pipeline_backend_alsa.h" 15 #include "chromecast/media/cma/backend/alsa/media_pipeline_backend_alsa.h"
16 #include "chromecast/media/cma/backend/alsa/stream_mixer_alsa.h" 16 #include "chromecast/media/cma/backend/alsa/stream_mixer_alsa.h"
17 #include "chromecast/media/cma/backend/alsa/stream_mixer_alsa_input.h" 17 #include "chromecast/media/cma/backend/alsa/stream_mixer_alsa_input.h"
18 18
19 namespace base { 19 namespace base {
20 class SingleThreadTaskRunner; 20 class SingleThreadTaskRunner;
21 } // namespace base 21 } // namespace base
22 22
(...skipping 134 matching lines...) Expand 10 before | Expand all | Expand 10 after
157 // End of members that queue_lock_ controls access for. 157 // End of members that queue_lock_ controls access for.
158 158
159 int current_buffer_offset_; 159 int current_buffer_offset_;
160 int max_queued_frames_; 160 int max_queued_frames_;
161 int fade_frames_remaining_; 161 int fade_frames_remaining_;
162 int fade_out_frames_total_; 162 int fade_out_frames_total_;
163 int zeroed_frames_; // current count of consecutive 0-filled frames 163 int zeroed_frames_; // current count of consecutive 0-filled frames
164 164
165 OnReadyToDeleteCb delete_cb_; 165 OnReadyToDeleteCb delete_cb_;
166 166
167 scoped_ptr<::media::MultiChannelResampler> resampler_; 167 std::unique_ptr<::media::MultiChannelResampler> resampler_;
168 168
169 base::WeakPtr<StreamMixerAlsaInputImpl> weak_this_; 169 base::WeakPtr<StreamMixerAlsaInputImpl> weak_this_;
170 base::WeakPtrFactory<StreamMixerAlsaInputImpl> weak_factory_; 170 base::WeakPtrFactory<StreamMixerAlsaInputImpl> weak_factory_;
171 171
172 DISALLOW_COPY_AND_ASSIGN(StreamMixerAlsaInputImpl); 172 DISALLOW_COPY_AND_ASSIGN(StreamMixerAlsaInputImpl);
173 }; 173 };
174 174
175 } // namespace media 175 } // namespace media
176 } // namespace chromecast 176 } // namespace chromecast
177 177
178 #endif // CHROMECAST_MEDIA_CMA_BACKEND_ALSA_STREAM_MIXER_ALSA_INPUT_IMPL_H_ 178 #endif // CHROMECAST_MEDIA_CMA_BACKEND_ALSA_STREAM_MIXER_ALSA_INPUT_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698