| Index: media/base/audio_shifter.cc
|
| diff --git a/media/base/audio_shifter.cc b/media/base/audio_shifter.cc
|
| index 6a268d3f6339d5bd6fee07966494f3dd1b66f301..4318c16c91b9c8115e804c4846c50830a2f8b569 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(
|
|
|