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

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

Issue 2561963002: base: Remove the string logging from CHECK(). (Closed)
Patch Set: checkstring: rebase Created 4 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 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
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
64 return buffer; 64 return buffer;
65 } 65 }
66 66
67 std::vector<int32_t> MediaStreamBufferManager::DequeueBuffers() { 67 std::vector<int32_t> MediaStreamBufferManager::DequeueBuffers() {
68 std::vector<int32_t> buffers(buffer_queue_.begin(), buffer_queue_.end()); 68 std::vector<int32_t> buffers(buffer_queue_.begin(), buffer_queue_.end());
69 buffer_queue_.clear(); 69 buffer_queue_.clear();
70 return buffers; 70 return buffers;
71 } 71 }
72 72
73 void MediaStreamBufferManager::EnqueueBuffer(int32_t index) { 73 void MediaStreamBufferManager::EnqueueBuffer(int32_t index) {
74 CHECK_GE(index, 0) << "Invalid buffer index"; 74 // Invalid buffer index
75 CHECK_LT(index, number_of_buffers_) << "Invalid buffer index"; 75 CHECK_GE(index, 0);
76 // Invalid buffer index
77 CHECK_LT(index, number_of_buffers_);
76 buffer_queue_.push_back(index); 78 buffer_queue_.push_back(index);
77 delegate_->OnNewBufferEnqueued(); 79 delegate_->OnNewBufferEnqueued();
78 } 80 }
79 81
80 bool MediaStreamBufferManager::HasAvailableBuffer() { 82 bool MediaStreamBufferManager::HasAvailableBuffer() {
81 return !buffer_queue_.empty(); 83 return !buffer_queue_.empty();
82 } 84 }
83 85
84 MediaStreamBuffer* MediaStreamBufferManager::GetBufferPointer(int32_t index) { 86 MediaStreamBuffer* MediaStreamBufferManager::GetBufferPointer(int32_t index) {
85 if (index < 0 || index >= number_of_buffers_) 87 if (index < 0 || index >= number_of_buffers_)
86 return NULL; 88 return NULL;
87 return buffers_[index]; 89 return buffers_[index];
88 } 90 }
89 91
90 } // namespace ppapi 92 } // namespace ppapi
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698