OLD | NEW |
1 /* | 1 /* |
2 * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved. | 2 * Copyright (c) 2012 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 424 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
435 &payload_specific)) { | 435 &payload_specific)) { |
436 LOG(LS_WARNING) << "Failed to get payload specifics."; | 436 LOG(LS_WARNING) << "Failed to get payload specifics."; |
437 return; | 437 return; |
438 } | 438 } |
439 rtp_header.type.Video.codec = payload_specific.Video.videoCodecType; | 439 rtp_header.type.Video.codec = payload_specific.Video.videoCodecType; |
440 rtp_header.type.Video.rotation = kVideoRotation_0; | 440 rtp_header.type.Video.rotation = kVideoRotation_0; |
441 if (header.extension.hasVideoRotation) { | 441 if (header.extension.hasVideoRotation) { |
442 rtp_header.type.Video.rotation = | 442 rtp_header.type.Video.rotation = |
443 ConvertCVOByteToVideoRotation(header.extension.videoRotation); | 443 ConvertCVOByteToVideoRotation(header.extension.videoRotation); |
444 } | 444 } |
| 445 rtp_header.type.Video.playout_delay = header.extension.playout_delay; |
| 446 |
445 OnReceivedPayloadData(nullptr, 0, &rtp_header); | 447 OnReceivedPayloadData(nullptr, 0, &rtp_header); |
446 } | 448 } |
447 | 449 |
448 bool RtpStreamReceiver::DeliverRtcp(const uint8_t* rtcp_packet, | 450 bool RtpStreamReceiver::DeliverRtcp(const uint8_t* rtcp_packet, |
449 size_t rtcp_packet_length) { | 451 size_t rtcp_packet_length) { |
450 { | 452 { |
451 rtc::CritScope lock(&receive_cs_); | 453 rtc::CritScope lock(&receive_cs_); |
452 if (!receiving_) { | 454 if (!receiving_) { |
453 return false; | 455 return false; |
454 } | 456 } |
(...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
533 const std::string& extension, int id) { | 535 const std::string& extension, int id) { |
534 // One-byte-extension local identifiers are in the range 1-14 inclusive. | 536 // One-byte-extension local identifiers are in the range 1-14 inclusive. |
535 RTC_DCHECK_GE(id, 1); | 537 RTC_DCHECK_GE(id, 1); |
536 RTC_DCHECK_LE(id, 14); | 538 RTC_DCHECK_LE(id, 14); |
537 RTC_DCHECK(RtpExtension::IsSupportedForVideo(extension)); | 539 RTC_DCHECK(RtpExtension::IsSupportedForVideo(extension)); |
538 RTC_CHECK(rtp_header_parser_->RegisterRtpHeaderExtension( | 540 RTC_CHECK(rtp_header_parser_->RegisterRtpHeaderExtension( |
539 StringToRtpExtensionType(extension), id)); | 541 StringToRtpExtensionType(extension), id)); |
540 } | 542 } |
541 | 543 |
542 } // namespace webrtc | 544 } // namespace webrtc |
OLD | NEW |