OLD | NEW |
1 /* | 1 /* |
2 * Copyright (c) 2016 The WebRTC project authors. All Rights Reserved. | 2 * Copyright (c) 2016 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 |
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
82 // wants.rotation_applied == ANY(sink.wants.rotation_applied) | 82 // wants.rotation_applied == ANY(sink.wants.rotation_applied) |
83 if (sink.wants.rotation_applied) { | 83 if (sink.wants.rotation_applied) { |
84 wants.rotation_applied = true; | 84 wants.rotation_applied = true; |
85 } | 85 } |
86 // wants.max_pixel_count == MIN(sink.wants.max_pixel_count) | 86 // wants.max_pixel_count == MIN(sink.wants.max_pixel_count) |
87 if (sink.wants.max_pixel_count && | 87 if (sink.wants.max_pixel_count && |
88 (!wants.max_pixel_count || | 88 (!wants.max_pixel_count || |
89 (*sink.wants.max_pixel_count < *wants.max_pixel_count))) { | 89 (*sink.wants.max_pixel_count < *wants.max_pixel_count))) { |
90 wants.max_pixel_count = sink.wants.max_pixel_count; | 90 wants.max_pixel_count = sink.wants.max_pixel_count; |
91 } | 91 } |
92 // wants.max_pixel_count_step_up == MIN(sink.wants.max_pixel_count_step_up) | 92 // Select the minimum requested target_pixel_count, if any, of all sinks so |
93 if (sink.wants.max_pixel_count_step_up && | 93 // that we don't over utilize the resources for any one. |
94 (!wants.max_pixel_count_step_up || | 94 // TODO(sprang): Consider using the median instead, since the limit can be |
95 (*sink.wants.max_pixel_count_step_up < | 95 // expressed by max_pixel_count. |
96 *wants.max_pixel_count_step_up))) { | 96 if (sink.wants.target_pixel_count && |
97 wants.max_pixel_count_step_up = sink.wants.max_pixel_count_step_up; | 97 (!wants.target_pixel_count || |
| 98 (*sink.wants.target_pixel_count < *wants.target_pixel_count))) { |
| 99 wants.target_pixel_count = sink.wants.target_pixel_count; |
98 } | 100 } |
99 } | 101 } |
100 | 102 |
101 if (wants.max_pixel_count && wants.max_pixel_count_step_up && | 103 if (wants.max_pixel_count && wants.target_pixel_count && |
102 *wants.max_pixel_count_step_up >= *wants.max_pixel_count) { | 104 *wants.target_pixel_count >= *wants.max_pixel_count) { |
103 wants.max_pixel_count_step_up = Optional<int>(); | 105 wants.target_pixel_count = wants.max_pixel_count; |
104 } | 106 } |
105 current_wants_ = wants; | 107 current_wants_ = wants; |
106 } | 108 } |
107 | 109 |
108 const rtc::scoped_refptr<webrtc::VideoFrameBuffer>& | 110 const rtc::scoped_refptr<webrtc::VideoFrameBuffer>& |
109 VideoBroadcaster::GetBlackFrameBuffer(int width, int height) { | 111 VideoBroadcaster::GetBlackFrameBuffer(int width, int height) { |
110 if (!black_frame_buffer_ || black_frame_buffer_->width() != width || | 112 if (!black_frame_buffer_ || black_frame_buffer_->width() != width || |
111 black_frame_buffer_->height() != height) { | 113 black_frame_buffer_->height() != height) { |
112 rtc::scoped_refptr<webrtc::I420Buffer> buffer = | 114 rtc::scoped_refptr<webrtc::I420Buffer> buffer = |
113 webrtc::I420Buffer::Create(width, height); | 115 webrtc::I420Buffer::Create(width, height); |
114 webrtc::I420Buffer::SetBlack(buffer.get()); | 116 webrtc::I420Buffer::SetBlack(buffer.get()); |
115 black_frame_buffer_ = buffer; | 117 black_frame_buffer_ = buffer; |
116 } | 118 } |
117 | 119 |
118 return black_frame_buffer_; | 120 return black_frame_buffer_; |
119 } | 121 } |
120 | 122 |
121 } // namespace rtc | 123 } // namespace rtc |
OLD | NEW |