Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/v3' into memory-optimizations
Browse files Browse the repository at this point in the history
# Conflicts:
#	worker/include/RTC/RateCalculator.hpp
  • Loading branch information
nazar-pc committed Mar 4, 2022
2 parents 2156186 + 4783b3d commit 217ceba
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
6 changes: 3 additions & 3 deletions rust/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -65,16 +65,16 @@ features = ["serde", "v4"]
version = "0.8.2"

[dev-dependencies]
actix = "0.12.0"
actix-web-actors = "4.0.0-beta.11"
actix = "0.13.0"
actix-web-actors = "4.1.0"
async-io = "1.6.0"
criterion = "0.3.5"
env_logger = "0.9.0"

[dev-dependencies.actix-web]
default-features = false
features = ["macros"]
version = "4.0.0-rc.3"
version = "4.0.1"

[[bench]]
name = "direct_data"
Expand Down
1 change: 1 addition & 0 deletions worker/include/RTC/RateCalculator.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ namespace RTC
{
std::memset(
static_cast<void*>(&this->buffer.front()), 0, sizeof(BufferItem) * this->buffer.size());

this->newestItemStartTime = 0u;
this->newestItemIndex = -1;
this->oldestItemStartTime = 0u;
Expand Down

0 comments on commit 217ceba

Please sign in to comment.