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

Unified Diff: media/base/audio_shifter.cc

Issue 1906423005: Replace scoped_ptr with std::unique_ptr in //media/base. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: scopedptr-media-base: android 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « media/base/audio_shifter.h ('k') | media/base/audio_shifter_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/base/audio_shifter.cc
diff --git a/media/base/audio_shifter.cc b/media/base/audio_shifter.cc
index f5160a220d92c225f2d7ed8e618b3c544e1586bd..cca46ed97aa34c5dfdb410970732808fbf3c5856 100644
--- a/media/base/audio_shifter.cc
+++ b/media/base/audio_shifter.cc
@@ -77,10 +77,8 @@ class ClockSmoother {
AudioShifter::AudioQueueEntry::AudioQueueEntry(
base::TimeTicks target_playout_time_,
- scoped_ptr<AudioBus> audio_) :
- target_playout_time(target_playout_time_),
- audio(audio_.release()) {
-}
+ std::unique_ptr<AudioBus> audio_)
+ : target_playout_time(target_playout_time_), audio(audio_.release()) {}
AudioShifter::AudioQueueEntry::AudioQueueEntry(const AudioQueueEntry& other) =
default;
@@ -111,7 +109,7 @@ AudioShifter::AudioShifter(base::TimeDelta max_buffer_size,
AudioShifter::~AudioShifter() {}
-void AudioShifter::Push(scoped_ptr<AudioBus> input,
+void AudioShifter::Push(std::unique_ptr<AudioBus> input,
base::TimeTicks playout_time) {
if (!queue_.empty()) {
playout_time = input_clock_smoother_->Smooth(
« no previous file with comments | « media/base/audio_shifter.h ('k') | media/base/audio_shifter_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698