zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

RtpSource: remove deprecated ctor, use designated initializers

Browse Source 
Bug: webrtc:10739, b/246753278
Change-Id: I215483709e1f415170bc42ea6d523ffad8eb1e76
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/275561
Commit-Queue: Alessio Bazzica <alessiob@webrtc.org>
Reviewed-by: Tomas Gunnarsson <tommi@webrtc.org>
Reviewed-by: Danil Chapovalov <danilchap@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#38085}
This commit is contained in:
Alessio Bazzica
2022-09-14 15:32:53 +02:00
committed by WebRTC LUCI CQ
parent ca27f1a1a0
commit 31996f48f4
2 changed files with 18 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
api/transport/rtp/rtp_source.h
View File

@ -33,19 +33,6 @@ class RtpSource {
RtpSource() = delete; RtpSource() = delete;
// TODO(bugs.webrtc.org/10739): Remove this constructor once all clients
// migrate to the version with absolute capture time.
RtpSource(int64_t timestamp_ms,
uint32_t source_id,
RtpSourceType source_type,
absl::optional<uint8_t> audio_level,
uint32_t rtp_timestamp)
: RtpSource(timestamp_ms,
source_id,
source_type,
rtp_timestamp,
{audio_level, absl::nullopt}) {}
RtpSource(int64_t timestamp_ms, RtpSource(int64_t timestamp_ms,
uint32_t source_id, uint32_t source_id,
RtpSourceType source_type, RtpSourceType source_type,

30
modules/rtp_rtcp/source/source_tracker_unittest.cc
View File

@ -266,10 +266,12 @@ TEST(SourceTrackerTest, OnFrameDeliveredRecordsSourcesDistinctSsrcs) {
kAbsoluteCaptureTime, kReceiveTime1)})); kAbsoluteCaptureTime, kReceiveTime1)}));
int64_t timestamp_ms = clock.TimeInMilliseconds(); int64_t timestamp_ms = clock.TimeInMilliseconds();
constexpr RtpSource::Extensions extensions0 = {kAudioLevel0, constexpr RtpSource::Extensions extensions0 = {
kAbsoluteCaptureTime}; .audio_level = kAudioLevel0,
constexpr RtpSource::Extensions extensions1 = {kAudioLevel1, .absolute_capture_time = kAbsoluteCaptureTime};
kAbsoluteCaptureTime}; constexpr RtpSource::Extensions extensions1 = {
.audio_level = kAudioLevel1,
.absolute_capture_time = kAbsoluteCaptureTime};
EXPECT_THAT(tracker.GetSources(), EXPECT_THAT(tracker.GetSources(),
ElementsAre(RtpSource(timestamp_ms, kSsrc2, RtpSourceType::SSRC, ElementsAre(RtpSource(timestamp_ms, kSsrc2, RtpSourceType::SSRC,
@ -354,12 +356,15 @@ TEST(SourceTrackerTest, OnFrameDeliveredUpdatesSources) {
constexpr Timestamp kReceiveTime1 = Timestamp::Millis(61); constexpr Timestamp kReceiveTime1 = Timestamp::Millis(61);
constexpr Timestamp kReceiveTime2 = Timestamp::Millis(62); constexpr Timestamp kReceiveTime2 = Timestamp::Millis(62);
constexpr RtpSource::Extensions extensions0 = {kAudioLevel0, constexpr RtpSource::Extensions extensions0 = {
kAbsoluteCaptureTime0}; .audio_level = kAudioLevel0,
constexpr RtpSource::Extensions extensions1 = {kAudioLevel1, .absolute_capture_time = kAbsoluteCaptureTime0};
kAbsoluteCaptureTime1}; constexpr RtpSource::Extensions extensions1 = {
constexpr RtpSource::Extensions extensions2 = {kAudioLevel2, .audio_level = kAudioLevel1,
kAbsoluteCaptureTime2}; .absolute_capture_time = kAbsoluteCaptureTime1};
constexpr RtpSource::Extensions extensions2 = {
.audio_level = kAudioLevel2,
.absolute_capture_time = kAbsoluteCaptureTime2};
SimulatedClock clock(1000000000000ULL); SimulatedClock clock(1000000000000ULL);
SourceTracker tracker(&clock); SourceTracker tracker(&clock);
@ -453,8 +458,9 @@ TEST(SourceTrackerTest, TimedOutSourcesAreRemoved) {
clock.AdvanceTimeMilliseconds(SourceTracker::kTimeoutMs); clock.AdvanceTimeMilliseconds(SourceTracker::kTimeoutMs);
constexpr RtpSource::Extensions extensions1 = {kAudioLevel1, constexpr RtpSource::Extensions extensions1 = {
kAbsoluteCaptureTime1}; .audio_level = kAudioLevel1,
.absolute_capture_time = kAbsoluteCaptureTime1};
EXPECT_THAT( EXPECT_THAT(
tracker.GetSources(), tracker.GetSources(),