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

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

Issue 1740133002: Simplify registration of RTP-header extensions. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: header Created 4 years, 9 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
« no previous file with comments | « webrtc/modules/rtp_rtcp/source/rtp_rtcp_impl.cc ('k') | webrtc/video/video_send_stream.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2013 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2013 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 211 matching lines...) Expand 10 before | Expand all | Expand 10 after
222 rtp_rtcp_->SetREMBStatus(true); 222 rtp_rtcp_->SetREMBStatus(true);
223 remb_->AddReceiveChannel(rtp_rtcp_); 223 remb_->AddReceiveChannel(rtp_rtcp_);
224 } 224 }
225 225
226 for (size_t i = 0; i < config_.rtp.extensions.size(); ++i) { 226 for (size_t i = 0; i < config_.rtp.extensions.size(); ++i) {
227 const std::string& extension = config_.rtp.extensions[i].name; 227 const std::string& extension = config_.rtp.extensions[i].name;
228 int id = config_.rtp.extensions[i].id; 228 int id = config_.rtp.extensions[i].id;
229 // One-byte-extension local identifiers are in the range 1-14 inclusive. 229 // One-byte-extension local identifiers are in the range 1-14 inclusive.
230 RTC_DCHECK_GE(id, 1); 230 RTC_DCHECK_GE(id, 1);
231 RTC_DCHECK_LE(id, 14); 231 RTC_DCHECK_LE(id, 14);
232 if (extension == RtpExtension::kTOffset) { 232 vie_receiver_->EnableReceiveRtpHeaderExtension(extension, id);
233 RTC_CHECK(vie_receiver_->EnableReceiveTimestampOffset(id));
234 } else if (extension == RtpExtension::kAbsSendTime) {
235 RTC_CHECK(vie_receiver_->EnableReceiveAbsoluteSendTime(id));
236 } else if (extension == RtpExtension::kVideoRotation) {
237 RTC_CHECK(vie_receiver_->EnableReceiveVideoRotation(id));
238 } else if (extension == RtpExtension::kTransportSequenceNumber) {
239 RTC_CHECK(vie_receiver_->EnableReceiveTransportSequenceNumber(id));
240 } else {
241 RTC_NOTREACHED() << "Unsupported RTP extension.";
242 }
243 } 233 }
244 234
245 if (config_.rtp.fec.ulpfec_payload_type != -1) { 235 if (config_.rtp.fec.ulpfec_payload_type != -1) {
246 // ULPFEC without RED doesn't make sense. 236 // ULPFEC without RED doesn't make sense.
247 RTC_DCHECK(config_.rtp.fec.red_payload_type != -1); 237 RTC_DCHECK(config_.rtp.fec.red_payload_type != -1);
248 VideoCodec codec; 238 VideoCodec codec;
249 memset(&codec, 0, sizeof(codec)); 239 memset(&codec, 0, sizeof(codec));
250 codec.codecType = kVideoCodecULPFEC; 240 codec.codecType = kVideoCodecULPFEC;
251 strncpy(codec.plName, "ulpfec", sizeof(codec.plName)); 241 strncpy(codec.plName, "ulpfec", sizeof(codec.plName));
252 codec.plType = config_.rtp.fec.ulpfec_payload_type; 242 codec.plType = config_.rtp.fec.ulpfec_payload_type;
(...skipping 175 matching lines...) Expand 10 before | Expand all | Expand 10 after
428 return true; 418 return true;
429 } 419 }
430 420
431 void VideoReceiveStream::Decode() { 421 void VideoReceiveStream::Decode() {
432 static const int kMaxDecodeWaitTimeMs = 50; 422 static const int kMaxDecodeWaitTimeMs = 50;
433 vcm_->Decode(kMaxDecodeWaitTimeMs); 423 vcm_->Decode(kMaxDecodeWaitTimeMs);
434 } 424 }
435 425
436 } // namespace internal 426 } // namespace internal
437 } // namespace webrtc 427 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/modules/rtp_rtcp/source/rtp_rtcp_impl.cc ('k') | webrtc/video/video_send_stream.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698