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