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 111 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
122 rtc::CritScope lock(&crit_); | 122 rtc::CritScope lock(&crit_); |
123 RTC_DCHECK(!rtp_modules_.empty()); | 123 RTC_DCHECK(!rtp_modules_.empty()); |
124 if (!active_) | 124 if (!active_) |
125 return Result(Result::ERROR_SEND_FAILED); | 125 return Result(Result::ERROR_SEND_FAILED); |
126 | 126 |
127 RTPVideoHeader rtp_video_header; | 127 RTPVideoHeader rtp_video_header; |
128 memset(&rtp_video_header, 0, sizeof(RTPVideoHeader)); | 128 memset(&rtp_video_header, 0, sizeof(RTPVideoHeader)); |
129 if (codec_specific_info) | 129 if (codec_specific_info) |
130 CopyCodecSpecific(codec_specific_info, &rtp_video_header); | 130 CopyCodecSpecific(codec_specific_info, &rtp_video_header); |
131 rtp_video_header.rotation = encoded_image.rotation_; | 131 rtp_video_header.rotation = encoded_image.rotation_; |
| 132 rtp_video_header.content_type = encoded_image.content_type_; |
132 rtp_video_header.playout_delay = encoded_image.playout_delay_; | 133 rtp_video_header.playout_delay = encoded_image.playout_delay_; |
133 | 134 |
134 int stream_index = rtp_video_header.simulcastIdx; | 135 int stream_index = rtp_video_header.simulcastIdx; |
135 RTC_DCHECK_LT(stream_index, rtp_modules_.size()); | 136 RTC_DCHECK_LT(stream_index, rtp_modules_.size()); |
136 uint32_t frame_id; | 137 uint32_t frame_id; |
137 bool send_result = rtp_modules_[stream_index]->SendOutgoingData( | 138 bool send_result = rtp_modules_[stream_index]->SendOutgoingData( |
138 encoded_image._frameType, payload_type_, encoded_image._timeStamp, | 139 encoded_image._frameType, payload_type_, encoded_image._timeStamp, |
139 encoded_image.capture_time_ms_, encoded_image._buffer, | 140 encoded_image.capture_time_ms_, encoded_image._buffer, |
140 encoded_image._length, fragmentation, &rtp_video_header, &frame_id); | 141 encoded_image._length, fragmentation, &rtp_video_header, &frame_id); |
141 if (!send_result) | 142 if (!send_result) |
(...skipping 16 matching lines...) Expand all Loading... |
158 BitrateAllocation layer_bitrate; | 159 BitrateAllocation layer_bitrate; |
159 for (int tl = 0; tl < kMaxTemporalStreams; ++tl) | 160 for (int tl = 0; tl < kMaxTemporalStreams; ++tl) |
160 layer_bitrate.SetBitrate(0, tl, bitrate.GetBitrate(si, tl)); | 161 layer_bitrate.SetBitrate(0, tl, bitrate.GetBitrate(si, tl)); |
161 rtp_modules_[si]->SetVideoBitrateAllocation(layer_bitrate); | 162 rtp_modules_[si]->SetVideoBitrateAllocation(layer_bitrate); |
162 } | 163 } |
163 } | 164 } |
164 } | 165 } |
165 } | 166 } |
166 | 167 |
167 } // namespace webrtc | 168 } // namespace webrtc |
OLD | NEW |