| 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 540 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 551 if (header.extension.hasVideoRotation) { | 551 if (header.extension.hasVideoRotation) { |
| 552 rtp_header.type.Video.rotation = header.extension.videoRotation; | 552 rtp_header.type.Video.rotation = header.extension.videoRotation; |
| 553 } | 553 } |
| 554 rtp_header.type.Video.content_type = VideoContentType::UNSPECIFIED; | 554 rtp_header.type.Video.content_type = VideoContentType::UNSPECIFIED; |
| 555 if (header.extension.hasVideoContentType) { | 555 if (header.extension.hasVideoContentType) { |
| 556 rtp_header.type.Video.content_type = header.extension.videoContentType; | 556 rtp_header.type.Video.content_type = header.extension.videoContentType; |
| 557 } | 557 } |
| 558 rtp_header.type.Video.video_timing = {0u, 0u, 0u, 0u, 0u, 0u, false}; | 558 rtp_header.type.Video.video_timing = {0u, 0u, 0u, 0u, 0u, 0u, false}; |
| 559 if (header.extension.has_video_timing) { | 559 if (header.extension.has_video_timing) { |
| 560 rtp_header.type.Video.video_timing = header.extension.video_timing; | 560 rtp_header.type.Video.video_timing = header.extension.video_timing; |
| 561 rtp_header.type.Video.video_timing.is_timing_frame = true; | |
| 562 } | 561 } |
| 563 rtp_header.type.Video.playout_delay = header.extension.playout_delay; | 562 rtp_header.type.Video.playout_delay = header.extension.playout_delay; |
| 564 | 563 |
| 565 OnReceivedPayloadData(nullptr, 0, &rtp_header); | 564 OnReceivedPayloadData(nullptr, 0, &rtp_header); |
| 566 } | 565 } |
| 567 | 566 |
| 568 bool RtpVideoStreamReceiver::DeliverRtcp(const uint8_t* rtcp_packet, | 567 bool RtpVideoStreamReceiver::DeliverRtcp(const uint8_t* rtcp_packet, |
| 569 size_t rtcp_packet_length) { | 568 size_t rtcp_packet_length) { |
| 570 { | 569 { |
| 571 rtc::CritScope lock(&receive_cs_); | 570 rtc::CritScope lock(&receive_cs_); |
| (...skipping 142 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 714 return; | 713 return; |
| 715 | 714 |
| 716 if (!sprop_decoder.DecodeSprop(sprop_base64_it->second.c_str())) | 715 if (!sprop_decoder.DecodeSprop(sprop_base64_it->second.c_str())) |
| 717 return; | 716 return; |
| 718 | 717 |
| 719 tracker_.InsertSpsPpsNalus(sprop_decoder.sps_nalu(), | 718 tracker_.InsertSpsPpsNalus(sprop_decoder.sps_nalu(), |
| 720 sprop_decoder.pps_nalu()); | 719 sprop_decoder.pps_nalu()); |
| 721 } | 720 } |
| 722 | 721 |
| 723 } // namespace webrtc | 722 } // namespace webrtc |
| OLD | NEW |