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 66 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
77 RTC_DCHECK(thread_checker_.CalledOnValidThread()); | 77 RTC_DCHECK(thread_checker_.CalledOnValidThread()); |
78 | 78 |
79 VideoSinkWants wants; | 79 VideoSinkWants wants; |
80 wants.rotation_applied = false; | 80 wants.rotation_applied = false; |
81 for (auto& sink : sink_pairs()) { | 81 for (auto& sink : sink_pairs()) { |
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 < wants.max_pixel_count) { |
88 (!wants.max_pixel_count || | |
89 (*sink.wants.max_pixel_count < *wants.max_pixel_count))) { | |
90 wants.max_pixel_count = sink.wants.max_pixel_count; | 88 wants.max_pixel_count = sink.wants.max_pixel_count; |
91 } | 89 } |
92 // Select the minimum requested target_pixel_count, if any, of all sinks so | 90 // Select the minimum requested target_pixel_count, if any, of all sinks so |
93 // that we don't over utilize the resources for any one. | 91 // that we don't over utilize the resources for any one. |
94 // TODO(sprang): Consider using the median instead, since the limit can be | 92 // TODO(sprang): Consider using the median instead, since the limit can be |
95 // expressed by max_pixel_count. | 93 // expressed by max_pixel_count. |
96 if (sink.wants.target_pixel_count && | 94 if (sink.wants.target_pixel_count && |
97 (!wants.target_pixel_count || | 95 (!wants.target_pixel_count || |
98 (*sink.wants.target_pixel_count < *wants.target_pixel_count))) { | 96 (*sink.wants.target_pixel_count < *wants.target_pixel_count))) { |
99 wants.target_pixel_count = sink.wants.target_pixel_count; | 97 wants.target_pixel_count = sink.wants.target_pixel_count; |
100 } | 98 } |
| 99 // Select the minimum for the requested max framerates. |
| 100 if (sink.wants.max_framerate_fps < wants.max_framerate_fps) { |
| 101 wants.max_framerate_fps = sink.wants.max_framerate_fps; |
| 102 } |
101 } | 103 } |
102 | 104 |
103 if (wants.max_pixel_count && wants.target_pixel_count && | 105 if (wants.target_pixel_count && |
104 *wants.target_pixel_count >= *wants.max_pixel_count) { | 106 *wants.target_pixel_count >= wants.max_pixel_count) { |
105 wants.target_pixel_count = wants.max_pixel_count; | 107 wants.target_pixel_count.emplace(wants.max_pixel_count); |
106 } | 108 } |
107 current_wants_ = wants; | 109 current_wants_ = wants; |
108 } | 110 } |
109 | 111 |
110 const rtc::scoped_refptr<webrtc::VideoFrameBuffer>& | 112 const rtc::scoped_refptr<webrtc::VideoFrameBuffer>& |
111 VideoBroadcaster::GetBlackFrameBuffer(int width, int height) { | 113 VideoBroadcaster::GetBlackFrameBuffer(int width, int height) { |
112 if (!black_frame_buffer_ || black_frame_buffer_->width() != width || | 114 if (!black_frame_buffer_ || black_frame_buffer_->width() != width || |
113 black_frame_buffer_->height() != height) { | 115 black_frame_buffer_->height() != height) { |
114 rtc::scoped_refptr<webrtc::I420Buffer> buffer = | 116 rtc::scoped_refptr<webrtc::I420Buffer> buffer = |
115 webrtc::I420Buffer::Create(width, height); | 117 webrtc::I420Buffer::Create(width, height); |
116 webrtc::I420Buffer::SetBlack(buffer.get()); | 118 webrtc::I420Buffer::SetBlack(buffer.get()); |
117 black_frame_buffer_ = buffer; | 119 black_frame_buffer_ = buffer; |
118 } | 120 } |
119 | 121 |
120 return black_frame_buffer_; | 122 return black_frame_buffer_; |
121 } | 123 } |
122 | 124 |
123 } // namespace rtc | 125 } // namespace rtc |
OLD | NEW |