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

Side by Side Diff: ppapi/proxy/audio_encoder_resource.cc

Issue 1864293002: Convert //ppapi to use 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 unified diff | Download patch
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ppapi/proxy/audio_encoder_resource.h"
6
7 #include "base/memory/ptr_util.h"
5 #include "base/memory/shared_memory.h" 8 #include "base/memory/shared_memory.h"
6 #include "ppapi/c/pp_array_output.h" 9 #include "ppapi/c/pp_array_output.h"
7 #include "ppapi/c/pp_codecs.h" 10 #include "ppapi/c/pp_codecs.h"
8 #include "ppapi/proxy/audio_buffer_resource.h" 11 #include "ppapi/proxy/audio_buffer_resource.h"
9 #include "ppapi/proxy/audio_encoder_resource.h"
10 #include "ppapi/proxy/ppapi_messages.h" 12 #include "ppapi/proxy/ppapi_messages.h"
11 #include "ppapi/shared_impl/array_writer.h" 13 #include "ppapi/shared_impl/array_writer.h"
12 #include "ppapi/shared_impl/media_stream_buffer.h" 14 #include "ppapi/shared_impl/media_stream_buffer.h"
13 #include "ppapi/thunk/enter.h" 15 #include "ppapi/thunk/enter.h"
14 16
15 namespace ppapi { 17 namespace ppapi {
16 namespace proxy { 18 namespace proxy {
17 19
18 namespace { 20 namespace {
19 21
(...skipping 203 matching lines...) Expand 10 before | Expand all | Expand 10 after
223 if (error) { 225 if (error) {
224 RunCallback(&initialize_callback_, error); 226 RunCallback(&initialize_callback_, error);
225 return; 227 return;
226 } 228 }
227 229
228 // Get audio buffers shared memory buffer. 230 // Get audio buffers shared memory buffer.
229 base::SharedMemoryHandle buffer_handle; 231 base::SharedMemoryHandle buffer_handle;
230 if (!params.TakeSharedMemoryHandleAtIndex(0, &buffer_handle) || 232 if (!params.TakeSharedMemoryHandleAtIndex(0, &buffer_handle) ||
231 !audio_buffer_manager_.SetBuffers( 233 !audio_buffer_manager_.SetBuffers(
232 audio_buffer_count, audio_buffer_size, 234 audio_buffer_count, audio_buffer_size,
233 make_scoped_ptr(new base::SharedMemory(buffer_handle, false)), 235 base::WrapUnique(new base::SharedMemory(buffer_handle, false)),
234 true)) { 236 true)) {
235 RunCallback(&initialize_callback_, PP_ERROR_NOMEMORY); 237 RunCallback(&initialize_callback_, PP_ERROR_NOMEMORY);
236 return; 238 return;
237 } 239 }
238 240
239 // Get bitstream buffers shared memory buffer. 241 // Get bitstream buffers shared memory buffer.
240 if (!params.TakeSharedMemoryHandleAtIndex(1, &buffer_handle) || 242 if (!params.TakeSharedMemoryHandleAtIndex(1, &buffer_handle) ||
241 !bitstream_buffer_manager_.SetBuffers( 243 !bitstream_buffer_manager_.SetBuffers(
242 bitstream_buffer_count, bitstream_buffer_size, 244 bitstream_buffer_count, bitstream_buffer_size,
243 make_scoped_ptr(new base::SharedMemory(buffer_handle, false)), 245 base::WrapUnique(new base::SharedMemory(buffer_handle, false)),
244 false)) { 246 false)) {
245 RunCallback(&initialize_callback_, PP_ERROR_NOMEMORY); 247 RunCallback(&initialize_callback_, PP_ERROR_NOMEMORY);
246 return; 248 return;
247 } 249 }
248 250
249 for (int32_t i = 0; i < bitstream_buffer_manager_.number_of_buffers(); i++) 251 for (int32_t i = 0; i < bitstream_buffer_manager_.number_of_buffers(); i++)
250 bitstream_buffer_map_.insert(std::make_pair( 252 bitstream_buffer_map_.insert(std::make_pair(
251 bitstream_buffer_manager_.GetBufferPointer(i)->bitstream.data, i)); 253 bitstream_buffer_manager_.GetBufferPointer(i)->bitstream.data, i));
252 254
253 encoder_last_error_ = PP_OK; 255 encoder_last_error_ = PP_OK;
(...skipping 95 matching lines...) Expand 10 before | Expand all | Expand 10 after
349 351
350 void AudioEncoderResource::ReleaseBuffers() { 352 void AudioEncoderResource::ReleaseBuffers() {
351 for (AudioBufferMap::iterator it = audio_buffers_.begin(); 353 for (AudioBufferMap::iterator it = audio_buffers_.begin();
352 it != audio_buffers_.end(); ++it) 354 it != audio_buffers_.end(); ++it)
353 it->second->Invalidate(); 355 it->second->Invalidate();
354 audio_buffers_.clear(); 356 audio_buffers_.clear();
355 } 357 }
356 358
357 } // namespace proxy 359 } // namespace proxy
358 } // namespace ppapi 360 } // namespace ppapi
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698