From 190abff43cd90c3f9fdd6a574d76f9e472a9eeb2 Mon Sep 17 00:00:00 2001 From: penguinol Date: Thu, 1 Jun 2023 09:32:54 +0800 Subject: [PATCH 1/4] fix increase layer when current layer has not receive SR --- worker/src/RTC/SimulcastConsumer.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/worker/src/RTC/SimulcastConsumer.cpp b/worker/src/RTC/SimulcastConsumer.cpp index 44076dca1f..cf047c8790 100644 --- a/worker/src/RTC/SimulcastConsumer.cpp +++ b/worker/src/RTC/SimulcastConsumer.cpp @@ -367,11 +367,11 @@ namespace RTC MS_DEBUG_TAG(simulcast, "first SenderReport [ssrc:%" PRIu32 "]", rtpStream->GetSsrc()); - // If our current selected RTP stream does not yet have SR, do nothing since + // If our TsReference RTP stream does not yet have SR, do nothing since // we know we won't be able to switch. - auto* producerCurrentRtpStream = GetProducerCurrentRtpStream(); + auto* producerTsReferenceRtpStream = GetProducerTsReferenceRtpStream(); - if (!producerCurrentRtpStream || !producerCurrentRtpStream->GetSenderReportNtpMs()) + if (!producerTsReferenceRtpStream || !producerTsReferenceRtpStream ->GetSenderReportNtpMs()) return; if (IsActive()) From e12dbda97f1272a109e78df1d8c14f4349234700 Mon Sep 17 00:00:00 2001 From: penguinol Date: Thu, 1 Jun 2023 10:11:30 +0800 Subject: [PATCH 2/4] Update SimulcastConsumer.cpp --- worker/src/RTC/SimulcastConsumer.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/worker/src/RTC/SimulcastConsumer.cpp b/worker/src/RTC/SimulcastConsumer.cpp index cf047c8790..e18d12ecf3 100644 --- a/worker/src/RTC/SimulcastConsumer.cpp +++ b/worker/src/RTC/SimulcastConsumer.cpp @@ -371,7 +371,7 @@ namespace RTC // we know we won't be able to switch. auto* producerTsReferenceRtpStream = GetProducerTsReferenceRtpStream(); - if (!producerTsReferenceRtpStream || !producerTsReferenceRtpStream ->GetSenderReportNtpMs()) + if (!producerTsReferenceRtpStream || !producerTsReferenceRtpStream ->GetSenderReportNtpMs()) return; if (IsActive()) From dc1aba1486666db7625291c56a0155aac29cf04f Mon Sep 17 00:00:00 2001 From: penguinol Date: Thu, 1 Jun 2023 10:12:13 +0800 Subject: [PATCH 3/4] Update SimulcastConsumer.cpp --- worker/src/RTC/SimulcastConsumer.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/worker/src/RTC/SimulcastConsumer.cpp b/worker/src/RTC/SimulcastConsumer.cpp index e18d12ecf3..ef2b39c428 100644 --- a/worker/src/RTC/SimulcastConsumer.cpp +++ b/worker/src/RTC/SimulcastConsumer.cpp @@ -371,7 +371,7 @@ namespace RTC // we know we won't be able to switch. auto* producerTsReferenceRtpStream = GetProducerTsReferenceRtpStream(); - if (!producerTsReferenceRtpStream || !producerTsReferenceRtpStream ->GetSenderReportNtpMs()) + if (!producerTsReferenceRtpStream || !producerTsReferenceRtpStream->GetSenderReportNtpMs()) return; if (IsActive()) From 97dcc86a915e4888b119c6dc20e09b3496acca1b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?I=C3=B1aki=20Baz=20Castillo?= Date: Sun, 19 May 2024 19:51:47 +0200 Subject: [PATCH 4/4] Update worker/src/RTC/SimulcastConsumer.cpp cosmetic --- worker/src/RTC/SimulcastConsumer.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/worker/src/RTC/SimulcastConsumer.cpp b/worker/src/RTC/SimulcastConsumer.cpp index 07744ec557..c0633ca636 100644 --- a/worker/src/RTC/SimulcastConsumer.cpp +++ b/worker/src/RTC/SimulcastConsumer.cpp @@ -366,8 +366,8 @@ namespace RTC MS_DEBUG_TAG(simulcast, "first SenderReport [ssrc:%" PRIu32 "]", rtpStream->GetSsrc()); - // If our TsReference RTP stream does not yet have SR, do nothing since - // we know we won't be able to switch. + // If our RTP timestamp reference stream does not yet have SR, do nothing + // since we know we won't be able to switch. auto* producerTsReferenceRtpStream = GetProducerTsReferenceRtpStream(); if (!producerTsReferenceRtpStream || !producerTsReferenceRtpStream->GetSenderReportNtpMs())