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 114 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
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.content_type = encoded_image.content_type_; |
133 if (encoded_image.timing_.is_timing_frame) { | 133 if (encoded_image.timing_.is_timing_frame) { |
134 rtp_video_header.video_timing.encode_start_delta_ms = | 134 rtp_video_header.video_timing.encode_start_delta_ms = |
135 VideoTiming::GetDeltaCappedMs(encoded_image.capture_time_ms_, | 135 VideoSendTiming::GetDeltaCappedMs( |
136 encoded_image.timing_.encode_start_ms); | 136 encoded_image.capture_time_ms_, |
| 137 encoded_image.timing_.encode_start_ms); |
137 rtp_video_header.video_timing.encode_finish_delta_ms = | 138 rtp_video_header.video_timing.encode_finish_delta_ms = |
138 VideoTiming::GetDeltaCappedMs(encoded_image.capture_time_ms_, | 139 VideoSendTiming::GetDeltaCappedMs( |
139 encoded_image.timing_.encode_finish_ms); | 140 encoded_image.capture_time_ms_, |
| 141 encoded_image.timing_.encode_finish_ms); |
140 rtp_video_header.video_timing.packetization_finish_delta_ms = 0; | 142 rtp_video_header.video_timing.packetization_finish_delta_ms = 0; |
141 rtp_video_header.video_timing.pacer_exit_delta_ms = 0; | 143 rtp_video_header.video_timing.pacer_exit_delta_ms = 0; |
142 rtp_video_header.video_timing.network_timstamp_delta_ms = 0; | 144 rtp_video_header.video_timing.network_timstamp_delta_ms = 0; |
143 rtp_video_header.video_timing.network2_timstamp_delta_ms = 0; | 145 rtp_video_header.video_timing.network2_timstamp_delta_ms = 0; |
144 rtp_video_header.video_timing.is_timing_frame = true; | 146 rtp_video_header.video_timing.is_timing_frame = true; |
145 } else { | 147 } else { |
146 rtp_video_header.video_timing.is_timing_frame = false; | 148 rtp_video_header.video_timing.is_timing_frame = false; |
147 } | 149 } |
148 rtp_video_header.playout_delay = encoded_image.playout_delay_; | 150 rtp_video_header.playout_delay = encoded_image.playout_delay_; |
149 | 151 |
(...skipping 28 matching lines...) Expand all Loading... |
178 BitrateAllocation layer_bitrate; | 180 BitrateAllocation layer_bitrate; |
179 for (int tl = 0; tl < kMaxTemporalStreams; ++tl) | 181 for (int tl = 0; tl < kMaxTemporalStreams; ++tl) |
180 layer_bitrate.SetBitrate(0, tl, bitrate.GetBitrate(si, tl)); | 182 layer_bitrate.SetBitrate(0, tl, bitrate.GetBitrate(si, tl)); |
181 rtp_modules_[si]->SetVideoBitrateAllocation(layer_bitrate); | 183 rtp_modules_[si]->SetVideoBitrateAllocation(layer_bitrate); |
182 } | 184 } |
183 } | 185 } |
184 } | 186 } |
185 } | 187 } |
186 | 188 |
187 } // namespace webrtc | 189 } // namespace webrtc |
OLD | NEW |