fix mosaics when swithcing layers

nazar-pc · May 27, 2020 · de2ed3f · de2ed3f
1 parent 87039fd
commit de2ed3f
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 3 deletions.
diff --git a/worker/include/RTC/SeqManager.hpp b/worker/include/RTC/SeqManager.hpp
@@ -36,7 +36,7 @@ namespace RTC
 		SeqManager() = default;
 
 	public:
-		void Sync(T input);
+		void Sync(T input, bool skip = false);
 		void Drop(T input);
 		void Offset(T offset);
 		bool Input(const T input, T& output);

diff --git a/worker/include/RTC/SimulcastConsumer.hpp b/worker/include/RTC/SimulcastConsumer.hpp
@@ -101,6 +101,7 @@ namespace RTC
 		std::vector<RTC::RtpStreamSend*> rtpStreams;
 		std::vector<RTC::RtpStream*> producerRtpStreams; // Indexed by spatial layer.
 		bool syncRequired{ false };
+		bool lastSentPacketHasMarker{ false };
 		RTC::SeqManager<uint16_t> rtpSeqManager;
 		int16_t preferredSpatialLayer{ -1 };
 		int16_t preferredTemporalLayer{ -1 };

diff --git a/worker/src/RTC/SeqManager.cpp b/worker/src/RTC/SeqManager.cpp
@@ -40,11 +40,14 @@ namespace RTC
 	}
 
 	template<typename T>
-	void SeqManager<T>::Sync(T input)
+	void SeqManager<T>::Sync(T input, bool skip)
 	{
 		// Update base.
 		this->base = this->maxOutput - input;
 
+		if (skip)
+			this->base += 1;
+
 		// Update maxInput.
 		this->maxInput = input;
 

diff --git a/worker/src/RTC/SimulcastConsumer.cpp b/worker/src/RTC/SimulcastConsumer.cpp
@@ -791,7 +791,7 @@ namespace RTC
 			this->tsOffset = tsOffset;
 
 			// Sync our RTP stream's sequence number.
-			this->rtpSeqManager.Sync(packet->GetSequenceNumber() - 1);
+			this->rtpSeqManager.Sync(packet->GetSequenceNumber() - 1, !this->lastSentPacketHasMarker);
 
 			this->encodingContext->SyncRequired();
 
@@ -869,6 +869,8 @@ namespace RTC
 		// Process the packet.
 		if (this->rtpStream->ReceivePacket(packet))
 		{
+			this->lastSentPacketHasMarker = packet->HasMarker();
+
 			// Send the packet.
 			this->listener->OnConsumerSendRtpPacket(this, packet);