Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(61)

Side by Side Diff: webrtc/video/rtp_video_stream_receiver.cc

Issue 2985283002: Unwrap picture ids in the RtpFrameReferencerFinder. (Closed)
Patch Set: Feedback Created 3 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « webrtc/video/rtp_video_stream_receiver.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 571 matching lines...) Expand 10 before | Expand all | Expand 10 after
582 if (rtp_rtcp_->RemoteNTP(&ntp_secs, &ntp_frac, nullptr, nullptr, 582 if (rtp_rtcp_->RemoteNTP(&ntp_secs, &ntp_frac, nullptr, nullptr,
583 &rtp_timestamp) != 0) { 583 &rtp_timestamp) != 0) {
584 // Waiting for RTCP. 584 // Waiting for RTCP.
585 return true; 585 return true;
586 } 586 }
587 ntp_estimator_.UpdateRtcpTimestamp(rtt, ntp_secs, ntp_frac, rtp_timestamp); 587 ntp_estimator_.UpdateRtcpTimestamp(rtt, ntp_secs, ntp_frac, rtp_timestamp);
588 588
589 return true; 589 return true;
590 } 590 }
591 591
592 void RtpVideoStreamReceiver::FrameContinuous(uint16_t picture_id) { 592 void RtpVideoStreamReceiver::FrameContinuous(int64_t picture_id) {
593 if (!nack_module_) 593 if (!nack_module_)
594 return; 594 return;
595 595
596 int seq_num = -1; 596 int seq_num = -1;
597 { 597 {
598 rtc::CritScope lock(&last_seq_num_cs_); 598 rtc::CritScope lock(&last_seq_num_cs_);
599 auto seq_num_it = last_seq_num_for_pic_id_.find(picture_id); 599 auto seq_num_it = last_seq_num_for_pic_id_.find(picture_id);
600 if (seq_num_it != last_seq_num_for_pic_id_.end()) 600 if (seq_num_it != last_seq_num_for_pic_id_.end())
601 seq_num = seq_num_it->second; 601 seq_num = seq_num_it->second;
602 } 602 }
603 if (seq_num != -1) 603 if (seq_num != -1)
604 nack_module_->ClearUpTo(seq_num); 604 nack_module_->ClearUpTo(seq_num);
605 } 605 }
606 606
607 void RtpVideoStreamReceiver::FrameDecoded(uint16_t picture_id) { 607 void RtpVideoStreamReceiver::FrameDecoded(int64_t picture_id) {
608 int seq_num = -1; 608 int seq_num = -1;
609 { 609 {
610 rtc::CritScope lock(&last_seq_num_cs_); 610 rtc::CritScope lock(&last_seq_num_cs_);
611 auto seq_num_it = last_seq_num_for_pic_id_.find(picture_id); 611 auto seq_num_it = last_seq_num_for_pic_id_.find(picture_id);
612 if (seq_num_it != last_seq_num_for_pic_id_.end()) { 612 if (seq_num_it != last_seq_num_for_pic_id_.end()) {
613 seq_num = seq_num_it->second; 613 seq_num = seq_num_it->second;
614 last_seq_num_for_pic_id_.erase(last_seq_num_for_pic_id_.begin(), 614 last_seq_num_for_pic_id_.erase(last_seq_num_for_pic_id_.begin(),
615 ++seq_num_it); 615 ++seq_num_it);
616 } 616 }
617 } 617 }
(...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after
708 return; 708 return;
709 709
710 if (!sprop_decoder.DecodeSprop(sprop_base64_it->second.c_str())) 710 if (!sprop_decoder.DecodeSprop(sprop_base64_it->second.c_str()))
711 return; 711 return;
712 712
713 tracker_.InsertSpsPpsNalus(sprop_decoder.sps_nalu(), 713 tracker_.InsertSpsPpsNalus(sprop_decoder.sps_nalu(),
714 sprop_decoder.pps_nalu()); 714 sprop_decoder.pps_nalu());
715 } 715 }
716 716
717 } // namespace webrtc 717 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/video/rtp_video_stream_receiver.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698