OLD | NEW |
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 |
(...skipping 134 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
145 if (!active_ || num_sending_modules_ == 0) | 145 if (!active_ || num_sending_modules_ == 0) |
146 return -1; | 146 return -1; |
147 | 147 |
148 int stream_idx = 0; | 148 int stream_idx = 0; |
149 | 149 |
150 RTPVideoHeader rtp_video_header; | 150 RTPVideoHeader rtp_video_header; |
151 memset(&rtp_video_header, 0, sizeof(RTPVideoHeader)); | 151 memset(&rtp_video_header, 0, sizeof(RTPVideoHeader)); |
152 if (codec_specific_info) | 152 if (codec_specific_info) |
153 CopyCodecSpecific(codec_specific_info, &rtp_video_header); | 153 CopyCodecSpecific(codec_specific_info, &rtp_video_header); |
154 rtp_video_header.rotation = encoded_image.rotation_; | 154 rtp_video_header.rotation = encoded_image.rotation_; |
| 155 rtp_video_header.playout_delay = encoded_image.playout_delay_; |
155 | 156 |
156 RTC_DCHECK_LT(rtp_video_header.simulcastIdx, rtp_modules_.size()); | 157 RTC_DCHECK_LT(rtp_video_header.simulcastIdx, rtp_modules_.size()); |
157 // The simulcast index might actually be larger than the number of modules | 158 // The simulcast index might actually be larger than the number of modules |
158 // in case the encoder was processing a frame during a codec reconfig. | 159 // in case the encoder was processing a frame during a codec reconfig. |
159 if (rtp_video_header.simulcastIdx >= num_sending_modules_) | 160 if (rtp_video_header.simulcastIdx >= num_sending_modules_) |
160 return -1; | 161 return -1; |
161 stream_idx = rtp_video_header.simulcastIdx; | 162 stream_idx = rtp_video_header.simulcastIdx; |
162 | 163 |
163 return rtp_modules_[stream_idx]->SendOutgoingData( | 164 return rtp_modules_[stream_idx]->SendOutgoingData( |
164 encoded_image._frameType, payload_type_, encoded_image._timeStamp, | 165 encoded_image._frameType, payload_type_, encoded_image._timeStamp, |
(...skipping 25 matching lines...) Expand all Loading... |
190 rtc::CritScope lock(&crit_); | 191 rtc::CritScope lock(&crit_); |
191 for (size_t i = 0; i < num_sending_modules_; ++i) { | 192 for (size_t i = 0; i < num_sending_modules_; ++i) { |
192 size_t module_payload_length = rtp_modules_[i]->MaxDataPayloadLength(); | 193 size_t module_payload_length = rtp_modules_[i]->MaxDataPayloadLength(); |
193 if (module_payload_length < min_payload_length) | 194 if (module_payload_length < min_payload_length) |
194 min_payload_length = module_payload_length; | 195 min_payload_length = module_payload_length; |
195 } | 196 } |
196 return min_payload_length; | 197 return min_payload_length; |
197 } | 198 } |
198 | 199 |
199 } // namespace webrtc | 200 } // namespace webrtc |
OLD | NEW |