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 425 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
436 rtp_header.header.paddingLength = 0; | 436 rtp_header.header.paddingLength = 0; |
437 PayloadUnion payload_specific; | 437 PayloadUnion payload_specific; |
438 if (!rtp_payload_registry_.GetPayloadSpecifics(last_media_payload_type, | 438 if (!rtp_payload_registry_.GetPayloadSpecifics(last_media_payload_type, |
439 &payload_specific)) { | 439 &payload_specific)) { |
440 LOG(LS_WARNING) << "Failed to get payload specifics."; | 440 LOG(LS_WARNING) << "Failed to get payload specifics."; |
441 return; | 441 return; |
442 } | 442 } |
443 rtp_header.type.Video.codec = payload_specific.Video.videoCodecType; | 443 rtp_header.type.Video.codec = payload_specific.Video.videoCodecType; |
444 rtp_header.type.Video.rotation = kVideoRotation_0; | 444 rtp_header.type.Video.rotation = kVideoRotation_0; |
445 if (header.extension.hasVideoRotation) { | 445 if (header.extension.hasVideoRotation) { |
446 rtp_header.type.Video.rotation = header.extension.videoRotation; | 446 rtp_header.type.Video.rotation = |
| 447 ConvertCVOByteToVideoRotation(header.extension.videoRotation); |
447 } | 448 } |
448 rtp_header.type.Video.playout_delay = header.extension.playout_delay; | 449 rtp_header.type.Video.playout_delay = header.extension.playout_delay; |
449 | 450 |
450 OnReceivedPayloadData(nullptr, 0, &rtp_header); | 451 OnReceivedPayloadData(nullptr, 0, &rtp_header); |
451 } | 452 } |
452 | 453 |
453 bool RtpStreamReceiver::DeliverRtcp(const uint8_t* rtcp_packet, | 454 bool RtpStreamReceiver::DeliverRtcp(const uint8_t* rtcp_packet, |
454 size_t rtcp_packet_length) { | 455 size_t rtcp_packet_length) { |
455 { | 456 { |
456 rtc::CritScope lock(&receive_cs_); | 457 rtc::CritScope lock(&receive_cs_); |
(...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
538 const std::string& extension, int id) { | 539 const std::string& extension, int id) { |
539 // One-byte-extension local identifiers are in the range 1-14 inclusive. | 540 // One-byte-extension local identifiers are in the range 1-14 inclusive. |
540 RTC_DCHECK_GE(id, 1); | 541 RTC_DCHECK_GE(id, 1); |
541 RTC_DCHECK_LE(id, 14); | 542 RTC_DCHECK_LE(id, 14); |
542 RTC_DCHECK(RtpExtension::IsSupportedForVideo(extension)); | 543 RTC_DCHECK(RtpExtension::IsSupportedForVideo(extension)); |
543 RTC_CHECK(rtp_header_parser_->RegisterRtpHeaderExtension( | 544 RTC_CHECK(rtp_header_parser_->RegisterRtpHeaderExtension( |
544 StringToRtpExtensionType(extension), id)); | 545 StringToRtpExtensionType(extension), id)); |
545 } | 546 } |
546 | 547 |
547 } // namespace webrtc | 548 } // namespace webrtc |
OLD | NEW |