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

Side by Side Diff: ppapi/shared_impl/media_stream_buffer_manager.cc

Issue 1864293002: Convert //ppapi to use std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: more nullptr 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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/shared_impl/media_stream_buffer_manager.h" 5 #include "ppapi/shared_impl/media_stream_buffer_manager.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include <utility> 9 #include <utility>
10 10
11 #include "base/logging.h" 11 #include "base/logging.h"
12 #include "ppapi/c/pp_errors.h" 12 #include "ppapi/c/pp_errors.h"
13 #include "ppapi/shared_impl/media_stream_buffer.h" 13 #include "ppapi/shared_impl/media_stream_buffer.h"
14 14
15 namespace ppapi { 15 namespace ppapi {
16 16
17 MediaStreamBufferManager::Delegate::~Delegate() {} 17 MediaStreamBufferManager::Delegate::~Delegate() {}
18 18
19 void MediaStreamBufferManager::Delegate::OnNewBufferEnqueued() {} 19 void MediaStreamBufferManager::Delegate::OnNewBufferEnqueued() {}
20 20
21 MediaStreamBufferManager::MediaStreamBufferManager(Delegate* delegate) 21 MediaStreamBufferManager::MediaStreamBufferManager(Delegate* delegate)
22 : delegate_(delegate), buffer_size_(0), number_of_buffers_(0) { 22 : delegate_(delegate), buffer_size_(0), number_of_buffers_(0) {
23 DCHECK(delegate_); 23 DCHECK(delegate_);
24 } 24 }
25 25
26 MediaStreamBufferManager::~MediaStreamBufferManager() {} 26 MediaStreamBufferManager::~MediaStreamBufferManager() {}
27 27
28 bool MediaStreamBufferManager::SetBuffers(int32_t number_of_buffers, 28 bool MediaStreamBufferManager::SetBuffers(
29 int32_t buffer_size, 29 int32_t number_of_buffers,
30 scoped_ptr<base::SharedMemory> shm, 30 int32_t buffer_size,
31 bool enqueue_all_buffers) { 31 std::unique_ptr<base::SharedMemory> shm,
32 bool enqueue_all_buffers) {
32 DCHECK(shm); 33 DCHECK(shm);
33 DCHECK_GT(number_of_buffers, 0); 34 DCHECK_GT(number_of_buffers, 0);
34 DCHECK_GT(buffer_size, 35 DCHECK_GT(buffer_size,
35 static_cast<int32_t>(sizeof(MediaStreamBuffer::Header))); 36 static_cast<int32_t>(sizeof(MediaStreamBuffer::Header)));
36 DCHECK_EQ(buffer_size & 0x3, 0); 37 DCHECK_EQ(buffer_size & 0x3, 0);
37 38
38 number_of_buffers_ = number_of_buffers; 39 number_of_buffers_ = number_of_buffers;
39 buffer_size_ = buffer_size; 40 buffer_size_ = buffer_size;
40 41
41 size_t size = number_of_buffers_ * buffer_size; 42 size_t size = number_of_buffers_ * buffer_size;
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
80 return !buffer_queue_.empty(); 81 return !buffer_queue_.empty();
81 } 82 }
82 83
83 MediaStreamBuffer* MediaStreamBufferManager::GetBufferPointer(int32_t index) { 84 MediaStreamBuffer* MediaStreamBufferManager::GetBufferPointer(int32_t index) {
84 if (index < 0 || index >= number_of_buffers_) 85 if (index < 0 || index >= number_of_buffers_)
85 return NULL; 86 return NULL;
86 return buffers_[index]; 87 return buffers_[index];
87 } 88 }
88 89
89 } // namespace ppapi 90 } // namespace ppapi
OLDNEW
« no previous file with comments | « ppapi/shared_impl/media_stream_buffer_manager.h ('k') | ppapi/shared_impl/media_stream_buffer_manager_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698