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

Unified Diff: content/renderer/pepper/pepper_audio_encoder_host.cc

Issue 1873783003: Convert //content/renderer 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 side-by-side diff with in-line comments
Download patch
Index: content/renderer/pepper/pepper_audio_encoder_host.cc
diff --git a/content/renderer/pepper/pepper_audio_encoder_host.cc b/content/renderer/pepper/pepper_audio_encoder_host.cc
index e7d3ca5c0c2e792f3a92cf59bb21455fc292cac3..5b42a7dded46acf71f6550419b8e37eaa5da1ec0 100644
--- a/content/renderer/pepper/pepper_audio_encoder_host.cc
+++ b/content/renderer/pepper/pepper_audio_encoder_host.cc
@@ -72,7 +72,7 @@ class PepperAudioEncoderHost::AudioEncoderImpl {
void RequestBitrateChange(uint32_t bitrate);
private:
- scoped_ptr<uint8_t[]> encoder_memory_;
+ std::unique_ptr<uint8_t[]> encoder_memory_;
OpusEncoder* opus_encoder_;
// Initialization parameters, only valid if |encoder_memory_| is not
@@ -116,7 +116,7 @@ bool PepperAudioEncoderHost::AudioEncoderImpl::Initialize(
if (encoder_size < 1)
return false;
- scoped_ptr<uint8_t[]> encoder_memory(new uint8_t[encoder_size]);
+ std::unique_ptr<uint8_t[]> encoder_memory(new uint8_t[encoder_size]);
opus_encoder_ = reinterpret_cast<OpusEncoder*>(encoder_memory.get());
if (opus_encoder_init(opus_encoder_, parameters.input_sample_rate,
@@ -222,7 +222,7 @@ int32_t PepperAudioEncoderHost::OnHostMsgInitialize(
if (!IsInitializationValid(parameters))
return PP_ERROR_NOTSUPPORTED;
- scoped_ptr<AudioEncoderImpl> encoder(new AudioEncoderImpl);
+ std::unique_ptr<AudioEncoderImpl> encoder(new AudioEncoderImpl);
if (!encoder->Initialize(parameters))
return PP_ERROR_FAILED;
if (!AllocateBuffers(parameters, encoder->GetNumberOfSamplesPerFrame()))
@@ -364,12 +364,12 @@ bool PepperAudioEncoderHost::AllocateBuffers(
!total_bitstream_memory_size.IsValid())
return false;
- scoped_ptr<base::SharedMemory> audio_memory(
+ std::unique_ptr<base::SharedMemory> audio_memory(
RenderThreadImpl::current()->HostAllocateSharedMemoryBuffer(
total_audio_memory_size.ValueOrDie()));
if (!audio_memory)
return false;
- scoped_ptr<ppapi::MediaStreamBufferManager> audio_buffer_manager(
+ std::unique_ptr<ppapi::MediaStreamBufferManager> audio_buffer_manager(
new ppapi::MediaStreamBufferManager(this));
if (!audio_buffer_manager->SetBuffers(kDefaultNumberOfAudioBuffers,
total_audio_buffer_size.ValueOrDie(),
@@ -388,12 +388,12 @@ bool PepperAudioEncoderHost::AllocateBuffers(
buffer->data_size = audio_buffer_size.ValueOrDie();
}
- scoped_ptr<base::SharedMemory> bitstream_memory(
+ std::unique_ptr<base::SharedMemory> bitstream_memory(
RenderThreadImpl::current()->HostAllocateSharedMemoryBuffer(
total_bitstream_memory_size.ValueOrDie()));
if (!bitstream_memory)
return false;
- scoped_ptr<ppapi::MediaStreamBufferManager> bitstream_buffer_manager(
+ std::unique_ptr<ppapi::MediaStreamBufferManager> bitstream_buffer_manager(
new ppapi::MediaStreamBufferManager(this));
if (!bitstream_buffer_manager->SetBuffers(kDefaultNumberOfAudioBuffers,
bitstream_buffer_size.ValueOrDie(),
@@ -494,8 +494,9 @@ void PepperAudioEncoderHost::Close() {
// static
void PepperAudioEncoderHost::StopAudioEncoder(
- scoped_ptr<AudioEncoderImpl> encoder,
- scoped_ptr<ppapi::MediaStreamBufferManager> audio_buffer_manager,
- scoped_ptr<ppapi::MediaStreamBufferManager> bitstream_buffer_manager) {}
+ std::unique_ptr<AudioEncoderImpl> encoder,
+ std::unique_ptr<ppapi::MediaStreamBufferManager> audio_buffer_manager,
+ std::unique_ptr<ppapi::MediaStreamBufferManager> bitstream_buffer_manager) {
+}
} // namespace content
« no previous file with comments | « content/renderer/pepper/pepper_audio_encoder_host.h ('k') | content/renderer/pepper/pepper_audio_input_host.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698