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

Unified Diff: content/browser/renderer_host/media/audio_input_sync_writer.cc

Issue 2752533003: Remove ScopedVector from content/browser/. (Closed)
Patch Set: Created 3 years, 9 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
Index: content/browser/renderer_host/media/audio_input_sync_writer.cc
diff --git a/content/browser/renderer_host/media/audio_input_sync_writer.cc b/content/browser/renderer_host/media/audio_input_sync_writer.cc
index 3bed144059548ebb64b41e9091ce70976dd1272d..c72b1cd7b0e5b1be50ccc754bcb6fc4d1b5dd336 100644
--- a/content/browser/renderer_host/media/audio_input_sync_writer.cc
+++ b/content/browser/renderer_host/media/audio_input_sync_writer.cc
@@ -63,9 +63,7 @@ AudioInputSyncWriter::AudioInputSyncWriter(void* shared_memory,
CHECK_EQ(0U, reinterpret_cast<uintptr_t>(ptr) &
(AudioBus::kChannelAlignment - 1));
AudioInputBuffer* buffer = reinterpret_cast<AudioInputBuffer*>(ptr);
- std::unique_ptr<AudioBus> audio_bus =
- AudioBus::WrapMemory(params, buffer->audio);
- audio_buses_.push_back(std::move(audio_bus));
+ audio_buses_.push_back(AudioBus::WrapMemory(params, buffer->audio));
ptr += shared_memory_segment_size_;
}
}
@@ -153,8 +151,7 @@ void AudioInputSyncWriter::Write(const AudioBus* data,
WriteParametersToCurrentSegment(volume, key_pressed, hardware_delay_bytes);
// Copy data into shared memory using pre-allocated audio buses.
- AudioBus* audio_bus = audio_buses_[current_segment_id_];
- data->CopyTo(audio_bus);
+ data->CopyTo(audio_buses_[current_segment_id_].get());
if (!SignalDataWrittenAndUpdateCounters())
write_error = true;
@@ -291,7 +288,7 @@ bool AudioInputSyncWriter::WriteDataFromFifoToSharedMemory() {
// Copy data from the fifo into shared memory using pre-allocated audio
// buses.
- (*audio_bus_it)->CopyTo(audio_buses_[current_segment_id_]);
+ (*audio_bus_it)->CopyTo(audio_buses_[current_segment_id_].get());
if (!SignalDataWrittenAndUpdateCounters())
write_error = true;

Powered by Google App Engine
This is Rietveld 408576698