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

Side by Side Diff: webrtc/common_video/i420_buffer_pool.cc

Issue 2474783005: Replace Check for too many pending frames in I420_buffer_pool with returning nullptr. Added histogr… (Closed)
Patch Set: Created 4 years, 1 month 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 /* 1 /*
2 * Copyright (c) 2015 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2015 The WebRTC project authors. All Rights Reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
11 #include "webrtc/common_video/include/i420_buffer_pool.h" 11 #include "webrtc/common_video/include/i420_buffer_pool.h"
12 12
13 #include "webrtc/base/checks.h" 13 #include "webrtc/base/checks.h"
14 14
15 namespace webrtc { 15 namespace webrtc {
16 16
17 const size_t I420BufferPool::kMaxNumberOfFramesBeforeCrash = 300; 17 I420BufferPool::I420BufferPool(bool zero_initialize,
18 18 size_t max_number_of_buffers)
19 I420BufferPool::I420BufferPool(bool zero_initialize) 19 : zero_initialize_(zero_initialize),
20 : zero_initialize_(zero_initialize) {} 20 max_number_of_buffers_(max_number_of_buffers) {}
21 21
22 void I420BufferPool::Release() { 22 void I420BufferPool::Release() {
23 buffers_.clear(); 23 buffers_.clear();
24 } 24 }
25 25
26 rtc::scoped_refptr<I420Buffer> I420BufferPool::CreateBuffer(int width, 26 rtc::scoped_refptr<I420Buffer> I420BufferPool::CreateBuffer(int width,
27 int height) { 27 int height) {
28 RTC_DCHECK_RUNS_SERIALIZED(&race_checker_); 28 RTC_DCHECK_RUNS_SERIALIZED(&race_checker_);
29 RTC_CHECK_LT(buffers_.size(), kMaxNumberOfFramesBeforeCrash)
30 << "I420BufferPool too big.";
31 // Release buffers with wrong resolution. 29 // Release buffers with wrong resolution.
32 for (auto it = buffers_.begin(); it != buffers_.end();) { 30 for (auto it = buffers_.begin(); it != buffers_.end();) {
33 if ((*it)->width() != width || (*it)->height() != height) 31 if ((*it)->width() != width || (*it)->height() != height)
34 it = buffers_.erase(it); 32 it = buffers_.erase(it);
35 else 33 else
36 ++it; 34 ++it;
37 } 35 }
38 // Look for a free buffer. 36 // Look for a free buffer.
39 for (const rtc::scoped_refptr<PooledI420Buffer>& buffer : buffers_) { 37 for (const rtc::scoped_refptr<PooledI420Buffer>& buffer : buffers_) {
40 // If the buffer is in use, the ref count will be >= 2, one from the list we 38 // If the buffer is in use, the ref count will be >= 2, one from the list we
41 // are looping over and one from the application. If the ref count is 1, 39 // are looping over and one from the application. If the ref count is 1,
42 // then the list we are looping over holds the only reference and it's safe 40 // then the list we are looping over holds the only reference and it's safe
43 // to reuse. 41 // to reuse.
44 if (buffer->HasOneRef()) 42 if (buffer->HasOneRef())
45 return buffer; 43 return buffer;
46 } 44 }
45
46 if (buffers_.size() >= max_number_of_buffers_)
47 return nullptr;
47 // Allocate new buffer. 48 // Allocate new buffer.
48 rtc::scoped_refptr<PooledI420Buffer> buffer = 49 rtc::scoped_refptr<PooledI420Buffer> buffer =
49 new PooledI420Buffer(width, height); 50 new PooledI420Buffer(width, height);
50 if (zero_initialize_) 51 if (zero_initialize_)
51 buffer->InitializeData(); 52 buffer->InitializeData();
52 buffers_.push_back(buffer); 53 buffers_.push_back(buffer);
53 return buffer; 54 return buffer;
54 } 55 }
55 56
56 } // namespace webrtc 57 } // namespace webrtc
OLDNEW
« no previous file with comments | « no previous file | webrtc/common_video/i420_buffer_pool_unittest.cc » ('j') | webrtc/common_video/include/i420_buffer_pool.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698