Fix #492 SimulcastConsumer cannot switch layers if initial tsReferenc…

…eSpatialLayer disappears (#1459)
versatica · Oct 18, 2024 · 22a5f5f · 22a5f5f
1 parent 173474c
commit 22a5f5f
Showing 1 changed file with 4 additions and 5 deletions.
diff --git a/worker/src/RTC/SimulcastConsumer.cpp b/worker/src/RTC/SimulcastConsumer.cpp
@@ -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);
@@ -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
  }