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 479 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
490 if (!rtp_payload_registry_.GetPayloadSpecifics(last_media_payload_type, | 490 if (!rtp_payload_registry_.GetPayloadSpecifics(last_media_payload_type, |
491 &payload_specific)) { | 491 &payload_specific)) { |
492 LOG(LS_WARNING) << "Failed to get payload specifics."; | 492 LOG(LS_WARNING) << "Failed to get payload specifics."; |
493 return; | 493 return; |
494 } | 494 } |
495 rtp_header.type.Video.codec = payload_specific.Video.videoCodecType; | 495 rtp_header.type.Video.codec = payload_specific.Video.videoCodecType; |
496 rtp_header.type.Video.rotation = kVideoRotation_0; | 496 rtp_header.type.Video.rotation = kVideoRotation_0; |
497 if (header.extension.hasVideoRotation) { | 497 if (header.extension.hasVideoRotation) { |
498 rtp_header.type.Video.rotation = header.extension.videoRotation; | 498 rtp_header.type.Video.rotation = header.extension.videoRotation; |
499 } | 499 } |
| 500 rtp_header.type.Video.content_type = kVideoContent_Default; |
| 501 if (header.extension.hasVideoContentType) { |
| 502 rtp_header.type.Video.content_type = header.extension.videoContentType; |
| 503 } |
500 rtp_header.type.Video.playout_delay = header.extension.playout_delay; | 504 rtp_header.type.Video.playout_delay = header.extension.playout_delay; |
501 | 505 |
502 OnReceivedPayloadData(nullptr, 0, &rtp_header); | 506 OnReceivedPayloadData(nullptr, 0, &rtp_header); |
503 } | 507 } |
504 | 508 |
505 bool RtpStreamReceiver::DeliverRtcp(const uint8_t* rtcp_packet, | 509 bool RtpStreamReceiver::DeliverRtcp(const uint8_t* rtcp_packet, |
506 size_t rtcp_packet_length) { | 510 size_t rtcp_packet_length) { |
507 { | 511 { |
508 rtc::CritScope lock(&receive_cs_); | 512 rtc::CritScope lock(&receive_cs_); |
509 if (!receiving_) { | 513 if (!receiving_) { |
(...skipping 141 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
651 return; | 655 return; |
652 | 656 |
653 if (!sprop_decoder.DecodeSprop(sprop_base64_it->second.c_str())) | 657 if (!sprop_decoder.DecodeSprop(sprop_base64_it->second.c_str())) |
654 return; | 658 return; |
655 | 659 |
656 tracker_.InsertSpsPpsNalus(sprop_decoder.sps_nalu(), | 660 tracker_.InsertSpsPpsNalus(sprop_decoder.sps_nalu(), |
657 sprop_decoder.pps_nalu()); | 661 sprop_decoder.pps_nalu()); |
658 } | 662 } |
659 | 663 |
660 } // namespace webrtc | 664 } // namespace webrtc |
OLD | NEW |