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

Unified Diff: media/base/audio_splicer.cc

Issue 1544313002: Convert Pass()→std::move() in //media (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years 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_unittest.cc ('k') | media/base/audio_video_metadata_extractor_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/base/audio_splicer.cc
diff --git a/media/base/audio_splicer.cc b/media/base/audio_splicer.cc
index cc0c72bf40a4badf05bf35d0a2e2237f36caec61..8e84fd73b6945bd56f945d058b52b85291b76e59 100644
--- a/media/base/audio_splicer.cc
+++ b/media/base/audio_splicer.cc
@@ -5,9 +5,9 @@
#include "media/base/audio_splicer.h"
#include <stdint.h>
-
#include <cstdlib>
#include <deque>
+#include <utility>
#include "base/logging.h"
#include "base/macros.h"
@@ -56,7 +56,7 @@ scoped_ptr<AudioBus> CreateAudioBufferWrapper(
wrapper->SetChannelData(
ch, reinterpret_cast<float*>(buffer->channel_data()[ch]));
}
- return wrapper.Pass();
+ return wrapper;
}
} // namespace
@@ -380,7 +380,7 @@ bool AudioSplicer::AddInput(const scoped_refptr<AudioBuffer>& input) {
// Crossfade the pre splice and post splice sections and transfer all relevant
// buffers into |output_sanitizer_|.
- CrossfadePostSplice(pre_splice.Pass(), crossfade_buffer);
+ CrossfadePostSplice(std::move(pre_splice), crossfade_buffer);
// Clear the splice timestamp so new splices can be accepted.
reset_splice_timestamps();
@@ -497,7 +497,7 @@ scoped_ptr<AudioBus> AudioSplicer::ExtractCrossfadeFromPreSplice(
pre_splice_sanitizer_->Reset();
DCHECK_EQ(output_bus->frames(), frames_read);
DCHECK_EQ(output_ts_helper.GetFramesToTarget(splice_timestamp_), 0);
- return output_bus.Pass();
+ return output_bus;
}
void AudioSplicer::CrossfadePostSplice(
« no previous file with comments | « media/base/audio_shifter_unittest.cc ('k') | media/base/audio_video_metadata_extractor_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698