Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix #492 SimulcastConsumer cannot switch layers if initial tsReferenc… #1459

Merged
merged 2 commits into from
Oct 18, 2024
Merged

Fix #492 SimulcastConsumer cannot switch layers if initial tsReferenc… #1459

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
101e99f
Fix #492 SimulcastConsumer cannot switch layers if initial tsReferenc…
Lynnworld Oct 18, 2024
6bc8c9d
Merge branch 'v3' into patch-4
ibc Oct 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions worker/src/RTC/SimulcastConsumer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1574,7 +1574,9 @@ namespace RTC
MS_TRACE();

// If we don't have yet a RTP timestamp reference, set it now.
if (newTargetSpatialLayer != -1 && this->tsReferenceSpatialLayer == -1)
if (
newTargetSpatialLayer != -1 && (this->tsReferenceSpatialLayer == -1 ||
!GetProducerTsReferenceRtpStream()->GetSenderReportNtpMs()))
{
MS_DEBUG_TAG(
simulcast, "using spatial layer %" PRIi16 " as RTP timestamp reference", newTargetSpatialLayer);
Expand Down Expand Up @@ -1646,10 +1648,7 @@ namespace RTC
return (
this->tsReferenceSpatialLayer == -1 ||
spatialLayer == this->tsReferenceSpatialLayer ||
(
GetProducerTsReferenceRtpStream()->GetSenderReportNtpMs() &&
this->producerRtpStreams.at(spatialLayer)->GetSenderReportNtpMs()
)
this->producerRtpStreams.at(spatialLayer)->GetSenderReportNtpMs()
);
// clang-format on
}
Expand Down
Loading