danog/libtgvoip
1
0
Fork 0
mirror of https://github.com/danog/libtgvoip.git synced 2024-11-26 12:14:39 +01:00
Code Issues Projects Releases Wiki Activity

Fix jitter buffer

Browse Source
This commit is contained in:
Daniil Gentili 2020-03-12 19:17:19 +01:00
parent 3b70f17223
commit 442326e814
Signed by: danog
GPG Key ID: 8C1BE3B34B230CA7
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
controller/net/JitterBuffer.cpp
View File

@ -95,7 +95,7 @@ void JitterBuffer::PutInternal(jitter_packet_t &pkt, bool overwriteExisting)
{
for (auto &slot : slots)
{
if (!slot.buffer.IsEmpty() && slot.timestamp == pkt.timestamp)
if (slot.timestamp == pkt.timestamp && !slot.buffer.IsEmpty())
{
slot.buffer.CopyFromOtherBuffer(pkt.buffer, pkt.size);
slot.size = pkt.size;
@ -118,7 +118,7 @@ void JitterBuffer::PutInternal(jitter_packet_t &pkt, bool overwriteExisting)
for (auto &slot : slots)
{
// Clear packets older than the last packet pulled from jitter buffer
if (!slot.buffer.IsEmpty() && slot.timestamp < nextFetchTimestamp - 1)
if (slot.timestamp < nextFetchTimestamp - 1 && !slot.buffer.IsEmpty())
{
slot.buffer = Buffer();
}
@ -164,7 +164,7 @@ void JitterBuffer::PutInternal(jitter_packet_t &pkt, bool overwriteExisting)
// If no free slots or too many used up slots to be useful
auto slot = GetCurrentDelay() >= maxUsedSlots ? slots.end() : std::find_if(slots.begin(), slots.end(), [](const jitter_packet_t &a) -> bool {
return !a.buffer.IsEmpty();
return a.buffer.IsEmpty();
});
if (slot == slots.end())
@ -228,7 +228,7 @@ size_t JitterBuffer::HandleOutput(unsigned char *buffer, size_t len, int offsetI
auto slot = std::find_if(slots.begin(), slots.end(), [&](const jitter_packet_t &a) -> bool {
return a.timestamp == nextFetchTimestamp;
});
if (!slot->buffer.IsEmpty())
if (slot != slots.end() && !slot->buffer.IsEmpty())
{
slot->buffer = Buffer();
}