Include all RTP packet infos from the mix list when updating the audio frame for mixing.
Users of the mixer can use this information to determine which sources were included in the frame. Bug: webrtc:12745 Change-Id: I11a8e3b1f4e8f95eb870336cad8dd082330bdf02 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/217768 Reviewed-by: Danil Chapovalov <danilchap@webrtc.org> Reviewed-by: Minyue Li <minyue@webrtc.org> Reviewed-by: Alessio Bazzica <alessiob@webrtc.org> Reviewed-by: Chen Xing <chxg@google.com> Commit-Queue: Doudou Kisabaka <doudouk@google.com> Cr-Commit-Position: refs/heads/master@{#34035}
This commit is contained in:
Doudou Kisabaka
committed by
WebRTC LUCI CQ
WebRTC LUCI CQ
parent
92bd9020af
commit
fe6595f006
@ -240,78 +240,156 @@ TEST(SourceTrackerTest, StartEmpty) {
|
||||
EXPECT_THAT(tracker.GetSources(), IsEmpty());
|
||||
}
|
||||
|
||||
TEST(SourceTrackerTest, OnFrameDeliveredRecordsSources) {
|
||||
constexpr uint32_t kSsrc = 10;
|
||||
TEST(SourceTrackerTest, OnFrameDeliveredRecordsSourcesDistinctSsrcs) {
|
||||
constexpr uint32_t kSsrc1 = 10;
|
||||
constexpr uint32_t kSsrc2 = 11;
|
||||
constexpr uint32_t kCsrcs0 = 20;
|
||||
constexpr uint32_t kCsrcs1 = 21;
|
||||
constexpr uint32_t kRtpTimestamp = 40;
|
||||
constexpr absl::optional<uint8_t> kAudioLevel = 50;
|
||||
constexpr uint32_t kCsrcs2 = 22;
|
||||
constexpr uint32_t kRtpTimestamp0 = 40;
|
||||
constexpr uint32_t kRtpTimestamp1 = 50;
|
||||
constexpr absl::optional<uint8_t> kAudioLevel0 = 50;
|
||||
constexpr absl::optional<uint8_t> kAudioLevel1 = 20;
|
||||
constexpr absl::optional<AbsoluteCaptureTime> kAbsoluteCaptureTime =
|
||||
AbsoluteCaptureTime{/*absolute_capture_timestamp=*/12,
|
||||
/*estimated_capture_clock_offset=*/absl::nullopt};
|
||||
constexpr Timestamp kReceiveTime = Timestamp::Millis(60);
|
||||
constexpr Timestamp kReceiveTime0 = Timestamp::Millis(60);
|
||||
constexpr Timestamp kReceiveTime1 = Timestamp::Millis(70);
|
||||
|
||||
SimulatedClock clock(1000000000000ULL);
|
||||
SourceTracker tracker(&clock);
|
||||
|
||||
tracker.OnFrameDelivered(RtpPacketInfos(
|
||||
{RtpPacketInfo(kSsrc, {kCsrcs0, kCsrcs1}, kRtpTimestamp, kAudioLevel,
|
||||
kAbsoluteCaptureTime, kReceiveTime)}));
|
||||
{RtpPacketInfo(kSsrc1, {kCsrcs0, kCsrcs1}, kRtpTimestamp0, kAudioLevel0,
|
||||
kAbsoluteCaptureTime, kReceiveTime0),
|
||||
RtpPacketInfo(kSsrc2, {kCsrcs2}, kRtpTimestamp1, kAudioLevel1,
|
||||
kAbsoluteCaptureTime, kReceiveTime1)}));
|
||||
|
||||
int64_t timestamp_ms = clock.TimeInMilliseconds();
|
||||
constexpr RtpSource::Extensions extensions = {kAudioLevel,
|
||||
kAbsoluteCaptureTime};
|
||||
constexpr RtpSource::Extensions extensions0 = {kAudioLevel0,
|
||||
kAbsoluteCaptureTime};
|
||||
constexpr RtpSource::Extensions extensions1 = {kAudioLevel1,
|
||||
kAbsoluteCaptureTime};
|
||||
|
||||
EXPECT_THAT(tracker.GetSources(),
|
||||
ElementsAre(RtpSource(timestamp_ms, kSsrc, RtpSourceType::SSRC,
|
||||
kRtpTimestamp, extensions),
|
||||
ElementsAre(RtpSource(timestamp_ms, kSsrc2, RtpSourceType::SSRC,
|
||||
kRtpTimestamp1, extensions1),
|
||||
RtpSource(timestamp_ms, kCsrcs2, RtpSourceType::CSRC,
|
||||
kRtpTimestamp1, extensions1),
|
||||
RtpSource(timestamp_ms, kSsrc1, RtpSourceType::SSRC,
|
||||
kRtpTimestamp0, extensions0),
|
||||
RtpSource(timestamp_ms, kCsrcs1, RtpSourceType::CSRC,
|
||||
kRtpTimestamp, extensions),
|
||||
kRtpTimestamp0, extensions0),
|
||||
RtpSource(timestamp_ms, kCsrcs0, RtpSourceType::CSRC,
|
||||
kRtpTimestamp, extensions)));
|
||||
kRtpTimestamp0, extensions0)));
|
||||
}
|
||||
|
||||
TEST(SourceTrackerTest, OnFrameDeliveredUpdatesSources) {
|
||||
TEST(SourceTrackerTest, OnFrameDeliveredRecordsSourcesSameSsrc) {
|
||||
constexpr uint32_t kSsrc = 10;
|
||||
constexpr uint32_t kCsrcs0 = 20;
|
||||
constexpr uint32_t kCsrcs1 = 21;
|
||||
constexpr uint32_t kCsrcs2 = 22;
|
||||
constexpr uint32_t kRtpTimestamp0 = 40;
|
||||
constexpr uint32_t kRtpTimestamp1 = 41;
|
||||
constexpr uint32_t kRtpTimestamp1 = 45;
|
||||
constexpr uint32_t kRtpTimestamp2 = 50;
|
||||
constexpr absl::optional<uint8_t> kAudioLevel0 = 50;
|
||||
constexpr absl::optional<uint8_t> kAudioLevel1 = absl::nullopt;
|
||||
constexpr absl::optional<AbsoluteCaptureTime> kAbsoluteCaptureTime0 =
|
||||
AbsoluteCaptureTime{12, 34};
|
||||
constexpr absl::optional<AbsoluteCaptureTime> kAbsoluteCaptureTime1 =
|
||||
AbsoluteCaptureTime{56, 78};
|
||||
constexpr absl::optional<uint8_t> kAudioLevel1 = 20;
|
||||
constexpr absl::optional<uint8_t> kAudioLevel2 = 10;
|
||||
constexpr absl::optional<AbsoluteCaptureTime> kAbsoluteCaptureTime =
|
||||
AbsoluteCaptureTime{/*absolute_capture_timestamp=*/12,
|
||||
/*estimated_capture_clock_offset=*/absl::nullopt};
|
||||
constexpr Timestamp kReceiveTime0 = Timestamp::Millis(60);
|
||||
constexpr Timestamp kReceiveTime1 = Timestamp::Millis(61);
|
||||
constexpr Timestamp kReceiveTime1 = Timestamp::Millis(70);
|
||||
constexpr Timestamp kReceiveTime2 = Timestamp::Millis(80);
|
||||
|
||||
SimulatedClock clock(1000000000000ULL);
|
||||
SourceTracker tracker(&clock);
|
||||
|
||||
tracker.OnFrameDelivered(RtpPacketInfos(
|
||||
{RtpPacketInfo(kSsrc, {kCsrcs0, kCsrcs1}, kRtpTimestamp0, kAudioLevel0,
|
||||
kAbsoluteCaptureTime0, kReceiveTime0)}));
|
||||
kAbsoluteCaptureTime, kReceiveTime0),
|
||||
RtpPacketInfo(kSsrc, {kCsrcs2}, kRtpTimestamp1, kAudioLevel1,
|
||||
kAbsoluteCaptureTime, kReceiveTime1),
|
||||
RtpPacketInfo(kSsrc, {kCsrcs0}, kRtpTimestamp2, kAudioLevel2,
|
||||
kAbsoluteCaptureTime, kReceiveTime2)}));
|
||||
|
||||
int64_t timestamp_ms_0 = clock.TimeInMilliseconds();
|
||||
int64_t timestamp_ms = clock.TimeInMilliseconds();
|
||||
constexpr RtpSource::Extensions extensions0 = {kAudioLevel0,
|
||||
kAbsoluteCaptureTime};
|
||||
constexpr RtpSource::Extensions extensions1 = {kAudioLevel1,
|
||||
kAbsoluteCaptureTime};
|
||||
constexpr RtpSource::Extensions extensions2 = {kAudioLevel2,
|
||||
kAbsoluteCaptureTime};
|
||||
|
||||
clock.AdvanceTimeMilliseconds(17);
|
||||
EXPECT_THAT(tracker.GetSources(),
|
||||
ElementsAre(RtpSource(timestamp_ms, kSsrc, RtpSourceType::SSRC,
|
||||
kRtpTimestamp2, extensions2),
|
||||
RtpSource(timestamp_ms, kCsrcs0, RtpSourceType::CSRC,
|
||||
kRtpTimestamp2, extensions2),
|
||||
RtpSource(timestamp_ms, kCsrcs2, RtpSourceType::CSRC,
|
||||
kRtpTimestamp1, extensions1),
|
||||
RtpSource(timestamp_ms, kCsrcs1, RtpSourceType::CSRC,
|
||||
kRtpTimestamp0, extensions0)));
|
||||
}
|
||||
|
||||
tracker.OnFrameDelivered(RtpPacketInfos(
|
||||
{RtpPacketInfo(kSsrc, {kCsrcs0, kCsrcs2}, kRtpTimestamp1, kAudioLevel1,
|
||||
kAbsoluteCaptureTime1, kReceiveTime1)}));
|
||||
|
||||
int64_t timestamp_ms_1 = clock.TimeInMilliseconds();
|
||||
TEST(SourceTrackerTest, OnFrameDeliveredUpdatesSources) {
|
||||
constexpr uint32_t kSsrc1 = 10;
|
||||
constexpr uint32_t kSsrc2 = 11;
|
||||
constexpr uint32_t kCsrcs0 = 20;
|
||||
constexpr uint32_t kCsrcs1 = 21;
|
||||
constexpr uint32_t kCsrcs2 = 22;
|
||||
constexpr uint32_t kRtpTimestamp0 = 40;
|
||||
constexpr uint32_t kRtpTimestamp1 = 41;
|
||||
constexpr uint32_t kRtpTimestamp2 = 42;
|
||||
constexpr absl::optional<uint8_t> kAudioLevel0 = 50;
|
||||
constexpr absl::optional<uint8_t> kAudioLevel1 = absl::nullopt;
|
||||
constexpr absl::optional<uint8_t> kAudioLevel2 = 10;
|
||||
constexpr absl::optional<AbsoluteCaptureTime> kAbsoluteCaptureTime0 =
|
||||
AbsoluteCaptureTime{12, 34};
|
||||
constexpr absl::optional<AbsoluteCaptureTime> kAbsoluteCaptureTime1 =
|
||||
AbsoluteCaptureTime{56, 78};
|
||||
constexpr absl::optional<AbsoluteCaptureTime> kAbsoluteCaptureTime2 =
|
||||
AbsoluteCaptureTime{89, 90};
|
||||
constexpr Timestamp kReceiveTime0 = Timestamp::Millis(60);
|
||||
constexpr Timestamp kReceiveTime1 = Timestamp::Millis(61);
|
||||
constexpr Timestamp kReceiveTime2 = Timestamp::Millis(62);
|
||||
|
||||
constexpr RtpSource::Extensions extensions0 = {kAudioLevel0,
|
||||
kAbsoluteCaptureTime0};
|
||||
constexpr RtpSource::Extensions extensions1 = {kAudioLevel1,
|
||||
kAbsoluteCaptureTime1};
|
||||
constexpr RtpSource::Extensions extensions2 = {kAudioLevel2,
|
||||
kAbsoluteCaptureTime2};
|
||||
|
||||
SimulatedClock clock(1000000000000ULL);
|
||||
SourceTracker tracker(&clock);
|
||||
|
||||
tracker.OnFrameDelivered(RtpPacketInfos(
|
||||
{RtpPacketInfo(kSsrc1, {kCsrcs0, kCsrcs1}, kRtpTimestamp0, kAudioLevel0,
|
||||
kAbsoluteCaptureTime0, kReceiveTime0)}));
|
||||
|
||||
int64_t timestamp_ms_0 = clock.TimeInMilliseconds();
|
||||
EXPECT_THAT(
|
||||
tracker.GetSources(),
|
||||
ElementsAre(RtpSource(timestamp_ms_0, kSsrc1, RtpSourceType::SSRC,
|
||||
kRtpTimestamp0, extensions0),
|
||||
RtpSource(timestamp_ms_0, kCsrcs1, RtpSourceType::CSRC,
|
||||
kRtpTimestamp0, extensions0),
|
||||
RtpSource(timestamp_ms_0, kCsrcs0, RtpSourceType::CSRC,
|
||||
kRtpTimestamp0, extensions0)));
|
||||
|
||||
// Deliver packets with updated sources.
|
||||
|
||||
clock.AdvanceTimeMilliseconds(17);
|
||||
tracker.OnFrameDelivered(RtpPacketInfos(
|
||||
{RtpPacketInfo(kSsrc1, {kCsrcs0, kCsrcs2}, kRtpTimestamp1, kAudioLevel1,
|
||||
kAbsoluteCaptureTime1, kReceiveTime1)}));
|
||||
|
||||
int64_t timestamp_ms_1 = clock.TimeInMilliseconds();
|
||||
|
||||
EXPECT_THAT(
|
||||
tracker.GetSources(),
|
||||
ElementsAre(RtpSource(timestamp_ms_1, kSsrc, RtpSourceType::SSRC,
|
||||
ElementsAre(RtpSource(timestamp_ms_1, kSsrc1, RtpSourceType::SSRC,
|
||||
kRtpTimestamp1, extensions1),
|
||||
RtpSource(timestamp_ms_1, kCsrcs2, RtpSourceType::CSRC,
|
||||
kRtpTimestamp1, extensions1),
|
||||
@ -319,6 +397,27 @@ TEST(SourceTrackerTest, OnFrameDeliveredUpdatesSources) {
|
||||
kRtpTimestamp1, extensions1),
|
||||
RtpSource(timestamp_ms_0, kCsrcs1, RtpSourceType::CSRC,
|
||||
kRtpTimestamp0, extensions0)));
|
||||
|
||||
// Deliver more packets with update csrcs and a new ssrc.
|
||||
clock.AdvanceTimeMilliseconds(17);
|
||||
tracker.OnFrameDelivered(RtpPacketInfos(
|
||||
{RtpPacketInfo(kSsrc2, {kCsrcs0}, kRtpTimestamp2, kAudioLevel2,
|
||||
kAbsoluteCaptureTime2, kReceiveTime2)}));
|
||||
|
||||
int64_t timestamp_ms_2 = clock.TimeInMilliseconds();
|
||||
|
||||
EXPECT_THAT(
|
||||
tracker.GetSources(),
|
||||
ElementsAre(RtpSource(timestamp_ms_2, kSsrc2, RtpSourceType::SSRC,
|
||||
kRtpTimestamp2, extensions2),
|
||||
RtpSource(timestamp_ms_2, kCsrcs0, RtpSourceType::CSRC,
|
||||
kRtpTimestamp2, extensions2),
|
||||
RtpSource(timestamp_ms_1, kSsrc1, RtpSourceType::SSRC,
|
||||
kRtpTimestamp1, extensions1),
|
||||
RtpSource(timestamp_ms_1, kCsrcs2, RtpSourceType::CSRC,
|
||||
kRtpTimestamp1, extensions1),
|
||||
RtpSource(timestamp_ms_0, kCsrcs1, RtpSourceType::CSRC,
|
||||
kRtpTimestamp0, extensions0)));
|
||||
}
|
||||
|
||||
TEST(SourceTrackerTest, TimedOutSourcesAreRemoved) {
|
||||
|
||||
Reference in New Issue
Block a user