Green-Sky/tomato
1
0
Fork 1
Code Issues Pull Requests 1 Actions Packages Projects Releases 1 Wiki Activity

Squashed 'external/toxcore/c-toxcore/' changes from c9cdae001..9ed2fa80d

Browse Source 
9ed2fa80d fix(toxav): remove extra copy of video frame on encode
de30cf3ad docs: Add new file kinds, that should be useful to all clients.
d5b5e879d fix(DHT): Correct node skipping logic timed out nodes.
30e71fe97 refactor: Generate event dispatch functions and add tox_events_dispatch.
8fdbb0b50 style: Format parameter lists in event handlers.
d00dee12b refactor: Add warning logs when losing chat invites.
b144e8db1 feat: Add a way to look up a file number by ID.
849281ea0 feat: Add a way to fetch groups by chat ID.
a2c177396 refactor: Harden event system and improve type safety.
8f5caa656 refactor: Add MessagePack string support to bin_pack.
34e8d5ad5 chore: Add GitHub CodeQL workflow and local Docker runner.
f7b068010 refactor: Add nullability annotations to event headers.
788abe651 refactor(toxav): Use system allocator for mutexes.
2e4b423eb refactor: Use specific typedefs for public API arrays.
2baf34775 docs(toxav): update idle iteration interval see 679444751876fa3882a717772918ebdc8f083354
2f87ac67b feat: Add Event Loop abstraction (Ev).
f8dfc38d8 test: Fix data race in ToxScenario virtual_clock.
38313921e test(TCP): Add regression test for TCP priority queue integrity.
f94a50d9a refactor(toxav): Replace mutable_mutex with dynamically allocated mutex.
ad054511e refactor: Internalize DHT structs and add debug helpers.
8b467cc96 fix: Prevent potential integer overflow in group chat handshake.
4962bdbb8 test: Improve TCP simulation and add tests
5f0227093 refactor: Allow nullable data in group chat handlers.
e97b18ea9 chore: Improve Windows Docker support.
b14943bbd refactor: Move Logger out of Messenger into Tox.
dd3136250 cleanup: Apply nullability qualifiers to C++ codebase.
1849f70fc refactor: Extract low-level networking code to net and os_network.
8fec75421 refactor: Delete tox_random, align on rng and os_random.
a03ae8051 refactor: Delete tox_memory, align on mem and os_memory.
4c88fed2c refactor: Use `std::` prefixes more consistently in C++ code.
72452f2ae test: Add some more tests for onion and shared key cache.
d5a51b09a cleanup: Use tox_attributes.h in tox_private.h and install it.
b6f5b9fc5 test: Add some benchmarks for various high level things.
8a8d02785 test(support): Introduce threaded Tox runner and simulation barrier
d68d1d095 perf(toxav): optimize audio and video intermediate buffers by keeping them around
REVERT: c9cdae001 fix(toxav): remove extra copy of video frame on encode

git-subtree-dir: external/toxcore/c-toxcore
git-subtree-split: 9ed2fa80d582c714d6bdde6a7648220a92cddff8
This commit is contained in:
Green Sky
2026-02-01 14:26:52 +01:00
parent 565efa4f39
commit 9b36dd9d99
274 changed files with 11891 additions and 4292 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
toxav/video_bench.cc
View File

@@ -4,8 +4,12 @@
#include <benchmark/benchmark.h>
#include <cstddef>
#include <cstdint>
#include <cstring>
#include <vector>
#include "../toxcore/attributes.h"
#include "../toxcore/logger.h"
#include "../toxcore/mono_time.h"
#include "../toxcore/os_memory.h"
@@ -19,20 +23,20 @@ class VideoBench : public benchmark::Fixture {
public:
void SetUp(const ::benchmark::State &state) override
{
const Memory *mem = os_memory();
const Memory *_Nonnull mem = os_memory();
log = logger_new(mem);
tm.t = 1000;
mono_time = mono_time_new(mem, mock_time_cb, &tm);
vc = vc_new(log, mono_time, 123, nullptr, nullptr);
vc = vc_new(mem, log, mono_time, 123, nullptr, nullptr);
width = static_cast<uint16_t>(state.range(0));
height = static_cast<uint16_t>(state.range(1));
width = static_cast<std::uint16_t>(state.range(0));
height = static_cast<std::uint16_t>(state.range(1));
// Use a standard bitrate for benchmarks
vc_reconfigure_encoder(vc, 2000, width, height, -1);
y.resize(static_cast<size_t>(width) * height);
u.resize((static_cast<size_t>(width) / 2) * (static_cast<size_t>(height) / 2));
v.resize((static_cast<size_t>(width) / 2) * (static_cast<size_t>(height) / 2));
y.resize(static_cast<std::size_t>(width) * height);
u.resize((static_cast<std::size_t>(width) / 2) * (static_cast<std::size_t>(height) / 2));
v.resize((static_cast<std::size_t>(width) / 2) * (static_cast<std::size_t>(height) / 2));
rtp_mock.capture_packets = false; // Disable capturing for benchmarks
rtp_mock.auto_forward = true;
@@ -58,13 +62,13 @@ public:
}
}
Logger *log = nullptr;
Mono_Time *mono_time = nullptr;
Logger *_Nullable log = nullptr;
Mono_Time *_Nullable mono_time = nullptr;
MockTime tm;
VCSession *vc = nullptr;
VCSession *_Nullable vc = nullptr;
RtpMock rtp_mock;
uint16_t width = 0, height = 0;
std::vector<uint8_t> y, u, v;
std::uint16_t width = 0, height = 0;
std::vector<std::uint8_t> y, u, v;
};
// Benchmark encoding a sequence of frames.
@@ -74,11 +78,12 @@ BENCHMARK_DEFINE_F(VideoBench, EncodeSequence)(benchmark::State &state)
int frame_index = 0;
// Pre-fill frames to avoid measuring fill_frame time
const int num_prefilled = 100;
std::vector<std::vector<uint8_t>> ys(num_prefilled, std::vector<uint8_t>(width * height));
std::vector<std::vector<uint8_t>> us(
num_prefilled, std::vector<uint8_t>((width / 2) * (height / 2)));
std::vector<std::vector<uint8_t>> vs(
num_prefilled, std::vector<uint8_t>((width / 2) * (height / 2)));
std::vector<std::vector<std::uint8_t>> ys(
num_prefilled, std::vector<std::uint8_t>(width * height));
std::vector<std::vector<std::uint8_t>> us(
num_prefilled, std::vector<std::uint8_t>((width / 2) * (height / 2)));
std::vector<std::vector<std::uint8_t>> vs(
num_prefilled, std::vector<std::uint8_t>((width / 2) * (height / 2)));
for (int i = 0; i < num_prefilled; ++i) {
fill_video_frame(width, height, i, ys[i], us[i], vs[i]);
}
@@ -90,8 +95,8 @@ BENCHMARK_DEFINE_F(VideoBench, EncodeSequence)(benchmark::State &state)
vc_encode(vc, width, height, ys[idx].data(), us[idx].data(), vs[idx].data(), flags);
vc_increment_frame_counter(vc);
uint8_t *pkt_data;
uint32_t pkt_size;
std::uint8_t *pkt_data;
std::uint32_t pkt_size;
bool is_keyframe;
while (vc_get_cx_data(vc, &pkt_data, &pkt_size, &is_keyframe)) {
benchmark::DoNotOptimize(pkt_data);
@@ -112,7 +117,7 @@ BENCHMARK_REGISTER_F(VideoBench, EncodeSequence)
BENCHMARK_DEFINE_F(VideoBench, DecodeSequence)(benchmark::State &state)
{
const int num_frames = 100;
std::vector<std::vector<uint8_t>> encoded_frames(num_frames);
std::vector<std::vector<std::uint8_t>> encoded_frames(num_frames);
std::vector<bool> is_keyframe_list(num_frames);
// Pre-encode
@@ -122,8 +127,8 @@ BENCHMARK_DEFINE_F(VideoBench, DecodeSequence)(benchmark::State &state)
vc_encode(vc, width, height, y.data(), u.data(), v.data(), flags);
vc_increment_frame_counter(vc);
uint8_t *pkt_data;
uint32_t pkt_size;
std::uint8_t *pkt_data;
std::uint32_t pkt_size;
bool is_kf;
while (vc_get_cx_data(vc, &pkt_data, &pkt_size, &is_kf)) {
encoded_frames[i].insert(encoded_frames[i].end(), pkt_data, pkt_data + pkt_size);
@@ -136,7 +141,7 @@ BENCHMARK_DEFINE_F(VideoBench, DecodeSequence)(benchmark::State &state)
int idx = frame_index % num_frames;
const auto &encoded_data = encoded_frames[idx];
rtp_send_data(log, rtp_mock.recv_session, encoded_data.data(),
static_cast<uint32_t>(encoded_data.size()), is_keyframe_list[idx]);
static_cast<std::uint32_t>(encoded_data.size()), is_keyframe_list[idx]);
vc_iterate(vc);
frame_index++;
}
@@ -153,11 +158,12 @@ BENCHMARK_DEFINE_F(VideoBench, FullSequence)(benchmark::State &state)
{
int frame_index = 0;
const int num_prefilled = 100;
std::vector<std::vector<uint8_t>> ys(num_prefilled, std::vector<uint8_t>(width * height));
std::vector<std::vector<uint8_t>> us(
num_prefilled, std::vector<uint8_t>((width / 2) * (height / 2)));
std::vector<std::vector<uint8_t>> vs(
num_prefilled, std::vector<uint8_t>((width / 2) * (height / 2)));
std::vector<std::vector<std::uint8_t>> ys(
num_prefilled, std::vector<std::uint8_t>(width * height));
std::vector<std::vector<std::uint8_t>> us(
num_prefilled, std::vector<std::uint8_t>((width / 2) * (height / 2)));
std::vector<std::vector<std::uint8_t>> vs(
num_prefilled, std::vector<std::uint8_t>((width / 2) * (height / 2)));
for (int i = 0; i < num_prefilled; ++i) {
fill_video_frame(width, height, i, ys[i], us[i], vs[i]);
}
@@ -168,17 +174,17 @@ BENCHMARK_DEFINE_F(VideoBench, FullSequence)(benchmark::State &state)
vc_encode(vc, width, height, ys[idx].data(), us[idx].data(), vs[idx].data(), flags);
vc_increment_frame_counter(vc);
uint8_t *pkt_data;
uint32_t pkt_size;
std::uint8_t *pkt_data;
std::uint32_t pkt_size;
bool is_keyframe = false;
// We need to collect all packets for the frame before sending to decoder
std::vector<uint8_t> frame_data;
std::vector<std::uint8_t> frame_data;
while (vc_get_cx_data(vc, &pkt_data, &pkt_size, &is_keyframe)) {
frame_data.insert(frame_data.end(), pkt_data, pkt_data + pkt_size);
}
rtp_send_data(log, rtp_mock.recv_session, frame_data.data(),
static_cast<uint32_t>(frame_data.size()), is_keyframe);
static_cast<std::uint32_t>(frame_data.size()), is_keyframe);
vc_iterate(vc);
frame_index++;