Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3)

Side by Side Diff: webrtc/video/payload_router.cc

Issue 2995953002: Revert of Add a flags field to video timing extension. (Closed)
Patch Set: Created 3 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 112 matching lines...) Expand 10 before | Expand all | Expand 10 after
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.content_type = encoded_image.content_type_;
133 if (encoded_image.timing_.flags != TimingFrameFlags::kInvalid) { 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 VideoSendTiming::GetDeltaCappedMs( 135 VideoSendTiming::GetDeltaCappedMs(
136 encoded_image.capture_time_ms_, 136 encoded_image.capture_time_ms_,
137 encoded_image.timing_.encode_start_ms); 137 encoded_image.timing_.encode_start_ms);
138 rtp_video_header.video_timing.encode_finish_delta_ms = 138 rtp_video_header.video_timing.encode_finish_delta_ms =
139 VideoSendTiming::GetDeltaCappedMs( 139 VideoSendTiming::GetDeltaCappedMs(
140 encoded_image.capture_time_ms_, 140 encoded_image.capture_time_ms_,
141 encoded_image.timing_.encode_finish_ms); 141 encoded_image.timing_.encode_finish_ms);
142 rtp_video_header.video_timing.packetization_finish_delta_ms = 0; 142 rtp_video_header.video_timing.packetization_finish_delta_ms = 0;
143 rtp_video_header.video_timing.pacer_exit_delta_ms = 0; 143 rtp_video_header.video_timing.pacer_exit_delta_ms = 0;
144 rtp_video_header.video_timing.network_timstamp_delta_ms = 0; 144 rtp_video_header.video_timing.network_timstamp_delta_ms = 0;
145 rtp_video_header.video_timing.network2_timstamp_delta_ms = 0; 145 rtp_video_header.video_timing.network2_timstamp_delta_ms = 0;
146 rtp_video_header.video_timing.is_timing_frame = true;
147 } else {
148 rtp_video_header.video_timing.is_timing_frame = false;
146 } 149 }
147 rtp_video_header.video_timing.flags = encoded_image.timing_.flags;
148 rtp_video_header.playout_delay = encoded_image.playout_delay_; 150 rtp_video_header.playout_delay = encoded_image.playout_delay_;
149 151
150 int stream_index = rtp_video_header.simulcastIdx; 152 int stream_index = rtp_video_header.simulcastIdx;
151 RTC_DCHECK_LT(stream_index, rtp_modules_.size()); 153 RTC_DCHECK_LT(stream_index, rtp_modules_.size());
152 uint32_t frame_id; 154 uint32_t frame_id;
153 bool send_result = rtp_modules_[stream_index]->SendOutgoingData( 155 bool send_result = rtp_modules_[stream_index]->SendOutgoingData(
154 encoded_image._frameType, payload_type_, encoded_image._timeStamp, 156 encoded_image._frameType, payload_type_, encoded_image._timeStamp,
155 encoded_image.capture_time_ms_, encoded_image._buffer, 157 encoded_image.capture_time_ms_, encoded_image._buffer,
156 encoded_image._length, fragmentation, &rtp_video_header, &frame_id); 158 encoded_image._length, fragmentation, &rtp_video_header, &frame_id);
157 if (!send_result) 159 if (!send_result)
(...skipping 20 matching lines...) Expand all
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
OLDNEW
« no previous file with comments | « webrtc/sdk/objc/Framework/Headers/WebRTC/RTCVideoCodec.h ('k') | webrtc/video/rtp_video_stream_receiver.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698