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 578 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
589 if (rtp_rtcp_->RemoteNTP(&ntp_secs, &ntp_frac, nullptr, nullptr, | 589 if (rtp_rtcp_->RemoteNTP(&ntp_secs, &ntp_frac, nullptr, nullptr, |
590 &rtp_timestamp) != 0) { | 590 &rtp_timestamp) != 0) { |
591 // Waiting for RTCP. | 591 // Waiting for RTCP. |
592 return true; | 592 return true; |
593 } | 593 } |
594 ntp_estimator_.UpdateRtcpTimestamp(rtt, ntp_secs, ntp_frac, rtp_timestamp); | 594 ntp_estimator_.UpdateRtcpTimestamp(rtt, ntp_secs, ntp_frac, rtp_timestamp); |
595 | 595 |
596 return true; | 596 return true; |
597 } | 597 } |
598 | 598 |
599 void RtpVideoStreamReceiver::FrameContinuous(uint16_t picture_id) { | 599 void RtpVideoStreamReceiver::FrameContinuous(int64_t picture_id) { |
600 if (!nack_module_) | 600 if (!nack_module_) |
601 return; | 601 return; |
602 | 602 |
603 int seq_num = -1; | 603 int seq_num = -1; |
604 { | 604 { |
605 rtc::CritScope lock(&last_seq_num_cs_); | 605 rtc::CritScope lock(&last_seq_num_cs_); |
606 auto seq_num_it = last_seq_num_for_pic_id_.find(picture_id); | 606 auto seq_num_it = last_seq_num_for_pic_id_.find(picture_id); |
607 if (seq_num_it != last_seq_num_for_pic_id_.end()) | 607 if (seq_num_it != last_seq_num_for_pic_id_.end()) |
608 seq_num = seq_num_it->second; | 608 seq_num = seq_num_it->second; |
609 } | 609 } |
610 if (seq_num != -1) | 610 if (seq_num != -1) |
611 nack_module_->ClearUpTo(seq_num); | 611 nack_module_->ClearUpTo(seq_num); |
612 } | 612 } |
613 | 613 |
614 void RtpVideoStreamReceiver::FrameDecoded(uint16_t picture_id) { | 614 void RtpVideoStreamReceiver::FrameDecoded(int64_t picture_id) { |
615 int seq_num = -1; | 615 int seq_num = -1; |
616 { | 616 { |
617 rtc::CritScope lock(&last_seq_num_cs_); | 617 rtc::CritScope lock(&last_seq_num_cs_); |
618 auto seq_num_it = last_seq_num_for_pic_id_.find(picture_id); | 618 auto seq_num_it = last_seq_num_for_pic_id_.find(picture_id); |
619 if (seq_num_it != last_seq_num_for_pic_id_.end()) { | 619 if (seq_num_it != last_seq_num_for_pic_id_.end()) { |
620 seq_num = seq_num_it->second; | 620 seq_num = seq_num_it->second; |
621 last_seq_num_for_pic_id_.erase(last_seq_num_for_pic_id_.begin(), | 621 last_seq_num_for_pic_id_.erase(last_seq_num_for_pic_id_.begin(), |
622 ++seq_num_it); | 622 ++seq_num_it); |
623 } | 623 } |
624 } | 624 } |
(...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
715 return; | 715 return; |
716 | 716 |
717 if (!sprop_decoder.DecodeSprop(sprop_base64_it->second.c_str())) | 717 if (!sprop_decoder.DecodeSprop(sprop_base64_it->second.c_str())) |
718 return; | 718 return; |
719 | 719 |
720 tracker_.InsertSpsPpsNalus(sprop_decoder.sps_nalu(), | 720 tracker_.InsertSpsPpsNalus(sprop_decoder.sps_nalu(), |
721 sprop_decoder.pps_nalu()); | 721 sprop_decoder.pps_nalu()); |
722 } | 722 } |
723 | 723 |
724 } // namespace webrtc | 724 } // namespace webrtc |
OLD | NEW |