mollyim/webrtc
1
0
Fork 0
mirror of https://github.com/mollyim/webrtc.git synced 2025-05-13 13:50:40 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

[Unwrap] Migrate TransportFeedbackDemuxer to use RtpSequenceNumberUnwrapper

Browse source 
Bug: webrtc:13982
Change-Id: I248f4f438a10830c9519361c01215b38dd3c2fc3
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/288967
Reviewed-by: Björn Terelius <terelius@webrtc.org>
Commit-Queue: Evan Shrubsole <eshr@webrtc.org>
Auto-Submit: Evan Shrubsole <eshr@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#39071}
This commit is contained in:
Evan Shrubsole 2023-01-09 13:42:24 +00:00 committed by WebRTC LUCI CQ
parent 57e5562c3f
commit 8c347eb5ea
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
modules/congestion_controller/rtp/transport_feedback_demuxer.cc
View file

@ -66,8 +66,7 @@ void TransportFeedbackDemuxer::OnTransportFeedback(
std::vector<StreamFeedbackObserver::StreamPacketInfo> stream_feedbacks; std::vector<StreamFeedbackObserver::StreamPacketInfo> stream_feedbacks;
for (const auto& packet : feedback.GetAllPackets()) { for (const auto& packet : feedback.GetAllPackets()) {
int64_t seq_num = int64_t seq_num = seq_num_unwrapper_.PeekUnwrap(packet.sequence_number());
seq_num_unwrapper_.UnwrapWithoutUpdate(packet.sequence_number());
auto it = history_.find(seq_num); auto it = history_.find(seq_num);
if (it != history_.end()) { if (it != history_.end()) {
auto packet_info = it->second; auto packet_info = it->second;

4
modules/congestion_controller/rtp/transport_feedback_demuxer.h
View file

@ -17,6 +17,7 @@
#include "api/sequence_checker.h" #include "api/sequence_checker.h"
#include "modules/include/module_common_types_public.h" #include "modules/include/module_common_types_public.h"
#include "modules/rtp_rtcp/include/rtp_rtcp_defines.h" #include "modules/rtp_rtcp/include/rtp_rtcp_defines.h"
#include "rtc_base/numerics/sequence_number_unwrapper.h"
#include "rtc_base/system/no_unique_address.h" #include "rtc_base/system/no_unique_address.h"
namespace webrtc { namespace webrtc {
@ -45,7 +46,8 @@ class TransportFeedbackDemuxer final : public StreamFeedbackProvider {
private: private:
RTC_NO_UNIQUE_ADDRESS SequenceChecker observer_checker_; RTC_NO_UNIQUE_ADDRESS SequenceChecker observer_checker_;
SequenceNumberUnwrapper seq_num_unwrapper_ RTC_GUARDED_BY(&observer_checker_); RtpSequenceNumberUnwrapper seq_num_unwrapper_
RTC_GUARDED_BY(&observer_checker_);
std::map<int64_t, StreamFeedbackObserver::StreamPacketInfo> history_ std::map<int64_t, StreamFeedbackObserver::StreamPacketInfo> history_
RTC_GUARDED_BY(&observer_checker_); RTC_GUARDED_BY(&observer_checker_);