2023-07-25 11:53:09 +02:00
|
|
|
/* SPDX-License-Identifier: GPL-3.0-or-later
|
|
|
|
* Copyright © 2016-2018 The TokTok team.
|
|
|
|
* Copyright © 2013-2015 Tox project.
|
|
|
|
*/
|
|
|
|
#include "video.h"
|
|
|
|
|
|
|
|
#include <assert.h>
|
|
|
|
#include <stdlib.h>
|
|
|
|
#include <string.h>
|
|
|
|
|
|
|
|
#include "msi.h"
|
|
|
|
#include "ring_buffer.h"
|
|
|
|
#include "rtp.h"
|
|
|
|
|
|
|
|
#include "../toxcore/ccompat.h"
|
|
|
|
#include "../toxcore/logger.h"
|
|
|
|
#include "../toxcore/mono_time.h"
|
|
|
|
#include "../toxcore/network.h"
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Soft deadline the decoder should attempt to meet, in "us" (microseconds).
|
|
|
|
* Set to zero for unlimited.
|
|
|
|
*
|
|
|
|
* By convention, the value 1 is used to mean "return as fast as possible."
|
|
|
|
*/
|
|
|
|
// TODO(zoff99): don't hardcode this, let the application choose it
|
|
|
|
#define WANTED_MAX_DECODER_FPS 40
|
|
|
|
|
|
|
|
/**
|
|
|
|
* VPX_DL_REALTIME (1)
|
|
|
|
* deadline parameter analogous to VPx REALTIME mode.
|
|
|
|
*
|
|
|
|
* VPX_DL_GOOD_QUALITY (1000000)
|
|
|
|
* deadline parameter analogous to VPx GOOD QUALITY mode.
|
|
|
|
*
|
|
|
|
* VPX_DL_BEST_QUALITY (0)
|
|
|
|
* deadline parameter analogous to VPx BEST QUALITY mode.
|
|
|
|
*/
|
|
|
|
#define MAX_DECODE_TIME_US (1000000 / WANTED_MAX_DECODER_FPS) // to allow x fps
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Codec control function to set encoder internal speed settings. Changes in
|
|
|
|
* this value influences, among others, the encoder's selection of motion
|
|
|
|
* estimation methods. Values greater than 0 will increase encoder speed at the
|
|
|
|
* expense of quality.
|
|
|
|
*
|
|
|
|
* Note Valid range for VP8: `-16..16`
|
|
|
|
*/
|
|
|
|
#define VP8E_SET_CPUUSED_VALUE 16
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Initialize encoder with this value.
|
|
|
|
*
|
|
|
|
* Target bandwidth to use for this stream, in kilobits per second.
|
|
|
|
*/
|
|
|
|
#define VIDEO_BITRATE_INITIAL_VALUE 5000
|
|
|
|
#define VIDEO_DECODE_BUFFER_SIZE 5 // this buffer has normally max. 1 entry
|
|
|
|
|
|
|
|
static vpx_codec_iface_t *video_codec_decoder_interface(void)
|
|
|
|
{
|
|
|
|
return vpx_codec_vp8_dx();
|
|
|
|
}
|
|
|
|
static vpx_codec_iface_t *video_codec_encoder_interface(void)
|
|
|
|
{
|
|
|
|
return vpx_codec_vp8_cx();
|
|
|
|
}
|
|
|
|
|
|
|
|
#define VIDEO_CODEC_DECODER_MAX_WIDTH 800 // its a dummy value, because the struct needs a value there
|
|
|
|
#define VIDEO_CODEC_DECODER_MAX_HEIGHT 600 // its a dummy value, because the struct needs a value there
|
|
|
|
|
|
|
|
#define VPX_MAX_DIST_START 40
|
|
|
|
|
|
|
|
#define VPX_MAX_ENCODER_THREADS 4
|
|
|
|
#define VPX_MAX_DECODER_THREADS 4
|
|
|
|
#define VIDEO_VP8_DECODER_POST_PROCESSING_ENABLED 0
|
|
|
|
|
|
|
|
static void vc_init_encoder_cfg(const Logger *log, vpx_codec_enc_cfg_t *cfg, int16_t kf_max_dist)
|
|
|
|
{
|
|
|
|
const vpx_codec_err_t rc = vpx_codec_enc_config_default(video_codec_encoder_interface(), cfg, 0);
|
|
|
|
|
|
|
|
if (rc != VPX_CODEC_OK) {
|
|
|
|
LOGGER_ERROR(log, "vc_init_encoder_cfg:Failed to get config: %s", vpx_codec_err_to_string(rc));
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Target bandwidth to use for this stream, in kilobits per second */
|
|
|
|
cfg->rc_target_bitrate = VIDEO_BITRATE_INITIAL_VALUE;
|
|
|
|
cfg->g_w = VIDEO_CODEC_DECODER_MAX_WIDTH;
|
|
|
|
cfg->g_h = VIDEO_CODEC_DECODER_MAX_HEIGHT;
|
|
|
|
cfg->g_pass = VPX_RC_ONE_PASS;
|
|
|
|
cfg->g_error_resilient = VPX_ERROR_RESILIENT_DEFAULT | VPX_ERROR_RESILIENT_PARTITIONS;
|
|
|
|
cfg->g_lag_in_frames = 0;
|
|
|
|
|
|
|
|
/* Allow lagged encoding
|
|
|
|
*
|
|
|
|
* If set, this value allows the encoder to consume a number of input
|
|
|
|
* frames before producing output frames. This allows the encoder to
|
|
|
|
* base decisions for the current frame on future frames. This does
|
|
|
|
* increase the latency of the encoding pipeline, so it is not appropriate
|
|
|
|
* in all situations (ex: realtime encoding).
|
|
|
|
*
|
|
|
|
* Note that this is a maximum value -- the encoder may produce frames
|
|
|
|
* sooner than the given limit. Set this value to 0 to disable this
|
|
|
|
* feature.
|
|
|
|
*/
|
|
|
|
cfg->kf_min_dist = 0;
|
|
|
|
cfg->kf_mode = VPX_KF_AUTO; // Encoder determines optimal placement automatically
|
|
|
|
cfg->rc_end_usage = VPX_VBR; // what quality mode?
|
|
|
|
|
|
|
|
/*
|
|
|
|
* VPX_VBR Variable Bit Rate (VBR) mode
|
|
|
|
* VPX_CBR Constant Bit Rate (CBR) mode
|
|
|
|
* VPX_CQ Constrained Quality (CQ) mode -> give codec a hint that we may be on low bandwidth connection
|
|
|
|
* VPX_Q Constant Quality (Q) mode
|
|
|
|
*/
|
|
|
|
if (kf_max_dist > 1) {
|
|
|
|
cfg->kf_max_dist = kf_max_dist; // a full frame every x frames minimum (can be more often, codec decides automatically)
|
|
|
|
LOGGER_DEBUG(log, "kf_max_dist=%d (1)", cfg->kf_max_dist);
|
|
|
|
} else {
|
|
|
|
cfg->kf_max_dist = VPX_MAX_DIST_START;
|
|
|
|
LOGGER_DEBUG(log, "kf_max_dist=%d (2)", cfg->kf_max_dist);
|
|
|
|
}
|
|
|
|
|
|
|
|
cfg->g_threads = VPX_MAX_ENCODER_THREADS; // Maximum number of threads to use
|
|
|
|
/* TODO: set these to something reasonable */
|
|
|
|
// cfg->g_timebase.num = 1;
|
|
|
|
// cfg->g_timebase.den = 60; // 60 fps
|
|
|
|
cfg->rc_resize_allowed = 1; // allow encoder to resize to smaller resolution
|
|
|
|
cfg->rc_resize_up_thresh = 40;
|
|
|
|
cfg->rc_resize_down_thresh = 5;
|
|
|
|
|
|
|
|
/* TODO: make quality setting an API call, but start with normal quality */
|
|
|
|
#if 0
|
|
|
|
/* Highest-resolution encoder settings */
|
|
|
|
cfg->rc_dropframe_thresh = 0;
|
|
|
|
cfg->rc_resize_allowed = 0;
|
|
|
|
cfg->rc_min_quantizer = 2;
|
|
|
|
cfg->rc_max_quantizer = 56;
|
|
|
|
cfg->rc_undershoot_pct = 100;
|
|
|
|
cfg->rc_overshoot_pct = 15;
|
|
|
|
cfg->rc_buf_initial_sz = 500;
|
|
|
|
cfg->rc_buf_optimal_sz = 600;
|
|
|
|
cfg->rc_buf_sz = 1000;
|
Squashed 'external/toxcore/c-toxcore/' changes from e2c01e457b..b03b571272
b03b571272 fix: flaky tcp test This only fixes the symptoms, not the real problem. Sometimes or consistently on some platforms a socket might need a moment before it can be written to.
32e67ab4c2 cleanup: use typedef for private message ID's in callback
7b1db6adc1 feat: add message IDs to private group messages
99e0bcc27d refactor: Observers/ignored peers can now send and receive custom packets
b3c3c49d26 fix: Disable IPv6 in Windows cross-compilation tests
e742deddff feat: Check hashes of Windows dependencies when cross-compiling
dfb9a0b02b fix: Test the current Windows Dockerfile, not an old Dockerhub image
14de93ccec chore: Use WineHQ's Wine as Debian Bookworm's crashes
ed37616249 docs: Update the Windows cross-compilation section
9bb79c174f cleanup: Remove a couple of unnecessary misc_tools dependencies
19475adb70 chore: Statically link OpenMP into the cracker fun util on Windows
1be311e51f feat: Build the fun utils when cross-compiling to Windows
88133f8446 chore: Strip Windows binaries
3cc0ae7535 refactor: Copy over all of the required static dependencies
c4fa8f7fb1 feat: Generate .def, .exp and .lib files when building for Windows
74bbac5363 feat: Let CMake create the dll instead of doing so ourselves
246642e9ae feat: Harden Windows cross-compilation
8d431c0d11 chore: Bump Windows build dependency versions
e519f7998b fix: Remove unnecessary wsock32 dependency on Windows
ed2b60c217 chore: Use a specific non-broken slimcc version.
d7f21010a1 chore: Update github actions.
e71a68b7f2 docs: Update the list of CMake options
77e08876ff chore: Remove mod and founder from group API naming scheme
12bc042767 docs: add the experimental api build option to INSTALL.md
e1fa5cae96 refactor: Rename Queries to Query to align with other enums.
be82a3ea30 fix: Correct type for conference offline peer numbers.
0627c36716 test: Add pkgsrc build.
92578afe4b test: Add FreeBSD VM action on GitHub.
52ece0f57b test: Build toxcore on NetBSD (VM).
3fe8ee2c11 chore: Only install tox_private.h on request.
9a8dfa06ab fix: save_compatibility_test failing on big-endian systems
86f5e55578 fix: Don't serve files from websockify.
710eb674a5 fix: Correctly pass extended public keys to group moderation code.
021db7031c refactor: Use `struct`s for extended public/secret keys.
a1e999fd80 chore: Compile libsodium reference implementation with compcert.
fbe3c19cf5 cleanup: correct a few nullable annotations
623e3ee5c3 cleanup: Don't use `memcpy` to cast arbitrary `struct`s to `uint8_t[]`.
c71567dc18 fix: Pass array, not array pointer, to `memcmp`.
9b46a08144 cleanup: Never pass `void*` directly to `memcpy`.
5d7b7a7bbc refactor: Use tox rng to seed the keypair generation.
961891d568 cleanup: Small improvements found by PVS Studio.
8201019f0d chore: Disable NGC saving by default, enable through Tox_Options.
5dd9ee3f65 cleanup: Replace pointer arithmetic with explicit `&arr[i]`.
ca4606d49d refactor: Use strong typedef for NGC peer id.
442213b722 cleanup: Simplify custom packet length check in NGC.
08d3393def fix: Correct a few potential null derefs in bootstrap daemon.
b9877b32b0 fix: Add missing memunlock of local variable when it goes out of scope.
dab5fe44b9 fix: Zero out stack-allocated secret key before return.
f058103299 refactor: Make prune_gc_sanctions_list more obviously correct.
3ba7a0dec9 docs: Add static analysis tool list to README.
8d0811a0f3 docs: Run prettier-markdown on markdown files.
969e3a2bfc refactor: Fix network test not using the strong typedef
93c83fbc7c refactor: Use strong typedef instead of struct for `Socket`.
9fe18b176f fix: Fix some false positive from PVS Studio.
7c44379ccb cleanup: Check that WINXP macro exists before comparing it.
5c93231bef refactor: Make tox mutex non-recursive.
aacff73939 docs: Fix up doxyfile.
d55fc85ff5 docs: Add more documentation to crypto_core.
5bdaaaedb6 refactor: Remove `Tox *` from `tox_dispatch`.
e202341e76 refactor: Don't rely on tox_dispatch passing tox in tests.
34df938f52 chore: Use C++ mode for clang-tidy.
8b05296a78 chore: Check that both gtest and gmock exist for tests.
42010660e1 test: Add slimcc compiler compatibility test.
b473630321 chore: Add some comments to the astyle config.
b7404f24f6 cleanup: Remove implicit bool conversions.
4e2dba4d9f chore: Reformat sources with astyle.
4359e3a6bc chore: Rename C++ headers to .hh suffixes.
0c05566e58 cleanup: Further `#include` cleanups.
8d29935b7a chore: Only check the bootstrap daemon checksum on release.
f70e588bc6 cleanup: Add more `const` where possible.
511bfe39c8 cleanup: Use Bazel modules to enforce proper `#include` hygiene.
1710a0d091 refactor: Move pack/unpack `IP_Port` from DHT into network module.
a975943564 chore: Really fix coverage docker image build.
c08409390f chore: Fix post-submit coverage image.
39aadf8922 fix: Don't use `memcmp` to compare `IP_Port`s.
d94246a906 fix: partially fix a bug that prevented group part messages from sending.
eeaa039222 chore: Fix rpm build; add a CI check for it.
8328449c1a chore: Speed up docker builds a bit by reducing layer count.
d6d67d56f3 cleanup: Add `const` where possible in auto tests.
6aa9e6850d cleanup: Minor cleanup of event unpack code.
bdf460a3a9 refactor: Rename `system_{memory,...}` to `os_{memory,...}`.
203e1af81e fix: a few off by one errors in group autotests
5c093c4888 cleanup: Remove all uses of `SIZEOF_VLA`.
662c2140f3 test: Add goblint static analyser.
8f07755834 cleanup: Use `memzero(x, s)` instead of `memset(x, 0, s)`.
a7258e40cf cleanup: Use explicit 0 instead of `PACKET_ID_PADDING`.
6370d0f15d cleanup: Expand the `Tox_Options` accessor macros.
14a1a0b9bd cleanup: Remove plan9 support.
a05dccad13 test: Add a simple new/delete test for Tox.
1cdcf938b9 cleanup: Add comment after every `#endif`.
ba99d4dc4b test: Fix comment I broke in the events test PR.
e07248debb refactor: Migrate auto_tests to new events API.
bdd42b5452 refactor: Add common msgpack array packer with callback.
3c659f5288 cleanup: Rename group to conference in groupav documentation.
89957be230 cleanup: Ensure handler params are named after callback params.
c650d9d345 refactor: Pass `this` pointer as first param to s11n callbacks.
e7fb91ddb8 refactor: Allow NULL pointers for byte arrays in events.
5e2c8cabc1 cleanup: make some improvements to group moderation test
259de4867e cleanup: Remove `bin_pack_{new,free}`.
21a8ff5895 cleanup: skip a do_gc iteration before removing peers marked for deletion
16809dc36e feat: Add dht_get_nodes_response event to the events system.
git-subtree-dir: external/toxcore/c-toxcore
git-subtree-split: b03b5712720de9a9901ea12fd741f177327a7021
2024-03-07 23:12:55 +01:00
|
|
|
#endif /* 0 */
|
2023-07-25 11:53:09 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
VCSession *vc_new(Mono_Time *mono_time, const Logger *log, ToxAV *av, uint32_t friend_number,
|
|
|
|
toxav_video_receive_frame_cb *cb, void *cb_data)
|
|
|
|
{
|
|
|
|
VCSession *vc = (VCSession *)calloc(1, sizeof(VCSession));
|
|
|
|
vpx_codec_err_t rc;
|
|
|
|
|
|
|
|
if (vc == nullptr) {
|
|
|
|
LOGGER_WARNING(log, "Allocation failed! Application might misbehave!");
|
|
|
|
return nullptr;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (create_recursive_mutex(vc->queue_mutex) != 0) {
|
|
|
|
LOGGER_WARNING(log, "Failed to create recursive mutex!");
|
|
|
|
free(vc);
|
|
|
|
return nullptr;
|
|
|
|
}
|
|
|
|
|
|
|
|
const int cpu_used_value = VP8E_SET_CPUUSED_VALUE;
|
|
|
|
|
|
|
|
vc->vbuf_raw = rb_new(VIDEO_DECODE_BUFFER_SIZE);
|
|
|
|
|
|
|
|
if (vc->vbuf_raw == nullptr) {
|
|
|
|
goto BASE_CLEANUP;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* VPX_CODEC_USE_FRAME_THREADING
|
|
|
|
* Enable frame-based multi-threading
|
|
|
|
*
|
|
|
|
* VPX_CODEC_USE_ERROR_CONCEALMENT
|
|
|
|
* Conceal errors in decoded frames
|
|
|
|
*/
|
|
|
|
vpx_codec_dec_cfg_t dec_cfg;
|
|
|
|
dec_cfg.threads = VPX_MAX_DECODER_THREADS; // Maximum number of threads to use
|
|
|
|
dec_cfg.w = VIDEO_CODEC_DECODER_MAX_WIDTH;
|
|
|
|
dec_cfg.h = VIDEO_CODEC_DECODER_MAX_HEIGHT;
|
|
|
|
|
|
|
|
LOGGER_DEBUG(log, "Using VP8 codec for decoder (0)");
|
|
|
|
rc = vpx_codec_dec_init(vc->decoder, video_codec_decoder_interface(), &dec_cfg,
|
|
|
|
VPX_CODEC_USE_FRAME_THREADING | VPX_CODEC_USE_POSTPROC);
|
|
|
|
|
|
|
|
if (rc == VPX_CODEC_INCAPABLE) {
|
|
|
|
LOGGER_WARNING(log, "Postproc not supported by this decoder (0)");
|
|
|
|
rc = vpx_codec_dec_init(vc->decoder, video_codec_decoder_interface(), &dec_cfg, VPX_CODEC_USE_FRAME_THREADING);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (rc != VPX_CODEC_OK) {
|
|
|
|
LOGGER_ERROR(log, "Init video_decoder failed: %s", vpx_codec_err_to_string(rc));
|
|
|
|
goto BASE_CLEANUP;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (VIDEO_VP8_DECODER_POST_PROCESSING_ENABLED == 1) {
|
|
|
|
vp8_postproc_cfg_t pp = {VP8_DEBLOCK, 1, 0};
|
|
|
|
const vpx_codec_err_t cc_res = vpx_codec_control(vc->decoder, VP8_SET_POSTPROC, &pp);
|
|
|
|
|
|
|
|
if (cc_res != VPX_CODEC_OK) {
|
|
|
|
LOGGER_WARNING(log, "Failed to turn on postproc");
|
|
|
|
} else {
|
|
|
|
LOGGER_DEBUG(log, "turn on postproc: OK");
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
vp8_postproc_cfg_t pp = {0, 0, 0};
|
|
|
|
vpx_codec_err_t cc_res = vpx_codec_control(vc->decoder, VP8_SET_POSTPROC, &pp);
|
|
|
|
|
|
|
|
if (cc_res != VPX_CODEC_OK) {
|
|
|
|
LOGGER_WARNING(log, "Failed to turn OFF postproc");
|
|
|
|
} else {
|
|
|
|
LOGGER_DEBUG(log, "Disable postproc: OK");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Set encoder to some initial values
|
|
|
|
*/
|
|
|
|
vpx_codec_enc_cfg_t cfg;
|
|
|
|
vc_init_encoder_cfg(log, &cfg, 1);
|
|
|
|
|
|
|
|
LOGGER_DEBUG(log, "Using VP8 codec for encoder (0.1)");
|
|
|
|
rc = vpx_codec_enc_init(vc->encoder, video_codec_encoder_interface(), &cfg, VPX_CODEC_USE_FRAME_THREADING);
|
|
|
|
|
|
|
|
if (rc != VPX_CODEC_OK) {
|
|
|
|
LOGGER_ERROR(log, "Failed to initialize encoder: %s", vpx_codec_err_to_string(rc));
|
|
|
|
goto BASE_CLEANUP_1;
|
|
|
|
}
|
|
|
|
|
|
|
|
rc = vpx_codec_control(vc->encoder, VP8E_SET_CPUUSED, cpu_used_value);
|
|
|
|
|
|
|
|
if (rc != VPX_CODEC_OK) {
|
|
|
|
LOGGER_ERROR(log, "Failed to set encoder control setting: %s", vpx_codec_err_to_string(rc));
|
|
|
|
vpx_codec_destroy(vc->encoder);
|
|
|
|
goto BASE_CLEANUP_1;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* VPX_CTRL_USE_TYPE(VP8E_SET_NOISE_SENSITIVITY, unsigned int)
|
|
|
|
* control function to set noise sensitivity
|
|
|
|
* 0: off, 1: OnYOnly, 2: OnYUV, 3: OnYUVAggressive, 4: Adaptive
|
|
|
|
*/
|
|
|
|
#if 0
|
|
|
|
rc = vpx_codec_control(vc->encoder, VP8E_SET_NOISE_SENSITIVITY, 2);
|
|
|
|
|
|
|
|
if (rc != VPX_CODEC_OK) {
|
|
|
|
LOGGER_ERROR(log, "Failed to set encoder control setting: %s", vpx_codec_err_to_string(rc));
|
|
|
|
vpx_codec_destroy(vc->encoder);
|
|
|
|
goto BASE_CLEANUP_1;
|
|
|
|
}
|
|
|
|
|
Squashed 'external/toxcore/c-toxcore/' changes from e2c01e457b..b03b571272
b03b571272 fix: flaky tcp test This only fixes the symptoms, not the real problem. Sometimes or consistently on some platforms a socket might need a moment before it can be written to.
32e67ab4c2 cleanup: use typedef for private message ID's in callback
7b1db6adc1 feat: add message IDs to private group messages
99e0bcc27d refactor: Observers/ignored peers can now send and receive custom packets
b3c3c49d26 fix: Disable IPv6 in Windows cross-compilation tests
e742deddff feat: Check hashes of Windows dependencies when cross-compiling
dfb9a0b02b fix: Test the current Windows Dockerfile, not an old Dockerhub image
14de93ccec chore: Use WineHQ's Wine as Debian Bookworm's crashes
ed37616249 docs: Update the Windows cross-compilation section
9bb79c174f cleanup: Remove a couple of unnecessary misc_tools dependencies
19475adb70 chore: Statically link OpenMP into the cracker fun util on Windows
1be311e51f feat: Build the fun utils when cross-compiling to Windows
88133f8446 chore: Strip Windows binaries
3cc0ae7535 refactor: Copy over all of the required static dependencies
c4fa8f7fb1 feat: Generate .def, .exp and .lib files when building for Windows
74bbac5363 feat: Let CMake create the dll instead of doing so ourselves
246642e9ae feat: Harden Windows cross-compilation
8d431c0d11 chore: Bump Windows build dependency versions
e519f7998b fix: Remove unnecessary wsock32 dependency on Windows
ed2b60c217 chore: Use a specific non-broken slimcc version.
d7f21010a1 chore: Update github actions.
e71a68b7f2 docs: Update the list of CMake options
77e08876ff chore: Remove mod and founder from group API naming scheme
12bc042767 docs: add the experimental api build option to INSTALL.md
e1fa5cae96 refactor: Rename Queries to Query to align with other enums.
be82a3ea30 fix: Correct type for conference offline peer numbers.
0627c36716 test: Add pkgsrc build.
92578afe4b test: Add FreeBSD VM action on GitHub.
52ece0f57b test: Build toxcore on NetBSD (VM).
3fe8ee2c11 chore: Only install tox_private.h on request.
9a8dfa06ab fix: save_compatibility_test failing on big-endian systems
86f5e55578 fix: Don't serve files from websockify.
710eb674a5 fix: Correctly pass extended public keys to group moderation code.
021db7031c refactor: Use `struct`s for extended public/secret keys.
a1e999fd80 chore: Compile libsodium reference implementation with compcert.
fbe3c19cf5 cleanup: correct a few nullable annotations
623e3ee5c3 cleanup: Don't use `memcpy` to cast arbitrary `struct`s to `uint8_t[]`.
c71567dc18 fix: Pass array, not array pointer, to `memcmp`.
9b46a08144 cleanup: Never pass `void*` directly to `memcpy`.
5d7b7a7bbc refactor: Use tox rng to seed the keypair generation.
961891d568 cleanup: Small improvements found by PVS Studio.
8201019f0d chore: Disable NGC saving by default, enable through Tox_Options.
5dd9ee3f65 cleanup: Replace pointer arithmetic with explicit `&arr[i]`.
ca4606d49d refactor: Use strong typedef for NGC peer id.
442213b722 cleanup: Simplify custom packet length check in NGC.
08d3393def fix: Correct a few potential null derefs in bootstrap daemon.
b9877b32b0 fix: Add missing memunlock of local variable when it goes out of scope.
dab5fe44b9 fix: Zero out stack-allocated secret key before return.
f058103299 refactor: Make prune_gc_sanctions_list more obviously correct.
3ba7a0dec9 docs: Add static analysis tool list to README.
8d0811a0f3 docs: Run prettier-markdown on markdown files.
969e3a2bfc refactor: Fix network test not using the strong typedef
93c83fbc7c refactor: Use strong typedef instead of struct for `Socket`.
9fe18b176f fix: Fix some false positive from PVS Studio.
7c44379ccb cleanup: Check that WINXP macro exists before comparing it.
5c93231bef refactor: Make tox mutex non-recursive.
aacff73939 docs: Fix up doxyfile.
d55fc85ff5 docs: Add more documentation to crypto_core.
5bdaaaedb6 refactor: Remove `Tox *` from `tox_dispatch`.
e202341e76 refactor: Don't rely on tox_dispatch passing tox in tests.
34df938f52 chore: Use C++ mode for clang-tidy.
8b05296a78 chore: Check that both gtest and gmock exist for tests.
42010660e1 test: Add slimcc compiler compatibility test.
b473630321 chore: Add some comments to the astyle config.
b7404f24f6 cleanup: Remove implicit bool conversions.
4e2dba4d9f chore: Reformat sources with astyle.
4359e3a6bc chore: Rename C++ headers to .hh suffixes.
0c05566e58 cleanup: Further `#include` cleanups.
8d29935b7a chore: Only check the bootstrap daemon checksum on release.
f70e588bc6 cleanup: Add more `const` where possible.
511bfe39c8 cleanup: Use Bazel modules to enforce proper `#include` hygiene.
1710a0d091 refactor: Move pack/unpack `IP_Port` from DHT into network module.
a975943564 chore: Really fix coverage docker image build.
c08409390f chore: Fix post-submit coverage image.
39aadf8922 fix: Don't use `memcmp` to compare `IP_Port`s.
d94246a906 fix: partially fix a bug that prevented group part messages from sending.
eeaa039222 chore: Fix rpm build; add a CI check for it.
8328449c1a chore: Speed up docker builds a bit by reducing layer count.
d6d67d56f3 cleanup: Add `const` where possible in auto tests.
6aa9e6850d cleanup: Minor cleanup of event unpack code.
bdf460a3a9 refactor: Rename `system_{memory,...}` to `os_{memory,...}`.
203e1af81e fix: a few off by one errors in group autotests
5c093c4888 cleanup: Remove all uses of `SIZEOF_VLA`.
662c2140f3 test: Add goblint static analyser.
8f07755834 cleanup: Use `memzero(x, s)` instead of `memset(x, 0, s)`.
a7258e40cf cleanup: Use explicit 0 instead of `PACKET_ID_PADDING`.
6370d0f15d cleanup: Expand the `Tox_Options` accessor macros.
14a1a0b9bd cleanup: Remove plan9 support.
a05dccad13 test: Add a simple new/delete test for Tox.
1cdcf938b9 cleanup: Add comment after every `#endif`.
ba99d4dc4b test: Fix comment I broke in the events test PR.
e07248debb refactor: Migrate auto_tests to new events API.
bdd42b5452 refactor: Add common msgpack array packer with callback.
3c659f5288 cleanup: Rename group to conference in groupav documentation.
89957be230 cleanup: Ensure handler params are named after callback params.
c650d9d345 refactor: Pass `this` pointer as first param to s11n callbacks.
e7fb91ddb8 refactor: Allow NULL pointers for byte arrays in events.
5e2c8cabc1 cleanup: make some improvements to group moderation test
259de4867e cleanup: Remove `bin_pack_{new,free}`.
21a8ff5895 cleanup: skip a do_gc iteration before removing peers marked for deletion
16809dc36e feat: Add dht_get_nodes_response event to the events system.
git-subtree-dir: external/toxcore/c-toxcore
git-subtree-split: b03b5712720de9a9901ea12fd741f177327a7021
2024-03-07 23:12:55 +01:00
|
|
|
#endif /* 0 */
|
2023-07-25 11:53:09 +02:00
|
|
|
vc->linfts = current_time_monotonic(mono_time);
|
|
|
|
vc->lcfd = 60;
|
|
|
|
vc->vcb = cb;
|
|
|
|
vc->vcb_user_data = cb_data;
|
|
|
|
vc->friend_number = friend_number;
|
|
|
|
vc->av = av;
|
|
|
|
vc->log = log;
|
|
|
|
return vc;
|
|
|
|
BASE_CLEANUP_1:
|
|
|
|
vpx_codec_destroy(vc->decoder);
|
|
|
|
BASE_CLEANUP:
|
|
|
|
pthread_mutex_destroy(vc->queue_mutex);
|
|
|
|
rb_kill(vc->vbuf_raw);
|
|
|
|
free(vc);
|
|
|
|
return nullptr;
|
|
|
|
}
|
|
|
|
|
|
|
|
void vc_kill(VCSession *vc)
|
|
|
|
{
|
|
|
|
if (vc == nullptr) {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
vpx_codec_destroy(vc->encoder);
|
|
|
|
vpx_codec_destroy(vc->decoder);
|
|
|
|
void *p;
|
|
|
|
|
|
|
|
while (rb_read(vc->vbuf_raw, &p)) {
|
|
|
|
free(p);
|
|
|
|
}
|
|
|
|
|
|
|
|
rb_kill(vc->vbuf_raw);
|
|
|
|
pthread_mutex_destroy(vc->queue_mutex);
|
|
|
|
LOGGER_DEBUG(vc->log, "Terminated video handler: %p", (void *)vc);
|
|
|
|
free(vc);
|
|
|
|
}
|
|
|
|
|
|
|
|
void vc_iterate(VCSession *vc)
|
|
|
|
{
|
|
|
|
if (vc == nullptr) {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
pthread_mutex_lock(vc->queue_mutex);
|
|
|
|
|
|
|
|
struct RTPMessage *p;
|
|
|
|
|
|
|
|
if (!rb_read(vc->vbuf_raw, (void **)&p)) {
|
|
|
|
LOGGER_TRACE(vc->log, "no Video frame data available");
|
|
|
|
pthread_mutex_unlock(vc->queue_mutex);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
const uint16_t log_rb_size = rb_size(vc->vbuf_raw);
|
|
|
|
pthread_mutex_unlock(vc->queue_mutex);
|
|
|
|
const struct RTPHeader *const header = &p->header;
|
|
|
|
|
|
|
|
uint32_t full_data_len;
|
|
|
|
|
|
|
|
if ((header->flags & RTP_LARGE_FRAME) != 0) {
|
|
|
|
full_data_len = header->data_length_full;
|
|
|
|
LOGGER_DEBUG(vc->log, "vc_iterate:001:full_data_len=%d", (int)full_data_len);
|
|
|
|
} else {
|
|
|
|
full_data_len = p->len;
|
|
|
|
LOGGER_DEBUG(vc->log, "vc_iterate:002");
|
|
|
|
}
|
|
|
|
|
|
|
|
LOGGER_DEBUG(vc->log, "vc_iterate: rb_read p->len=%d p->header.xe=%d", (int)full_data_len, p->header.xe);
|
|
|
|
LOGGER_DEBUG(vc->log, "vc_iterate: rb_read rb size=%d", (int)log_rb_size);
|
|
|
|
const vpx_codec_err_t rc = vpx_codec_decode(vc->decoder, p->data, full_data_len, nullptr, MAX_DECODE_TIME_US);
|
|
|
|
free(p);
|
|
|
|
|
|
|
|
if (rc != VPX_CODEC_OK) {
|
|
|
|
LOGGER_ERROR(vc->log, "Error decoding video: %d %s", (int)rc, vpx_codec_err_to_string(rc));
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Play decoded images */
|
|
|
|
vpx_codec_iter_t iter = nullptr;
|
|
|
|
|
|
|
|
for (vpx_image_t *dest = vpx_codec_get_frame(vc->decoder, &iter);
|
|
|
|
dest != nullptr;
|
|
|
|
dest = vpx_codec_get_frame(vc->decoder, &iter)) {
|
|
|
|
if (vc->vcb != nullptr) {
|
|
|
|
vc->vcb(vc->av, vc->friend_number, dest->d_w, dest->d_h,
|
|
|
|
dest->planes[0], dest->planes[1], dest->planes[2],
|
|
|
|
dest->stride[0], dest->stride[1], dest->stride[2], vc->vcb_user_data);
|
|
|
|
}
|
|
|
|
|
|
|
|
vpx_img_free(dest); // is this needed? none of the VPx examples show that
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
Squashed 'external/toxcore/c-toxcore/' changes from e2c01e457b..b03b571272
b03b571272 fix: flaky tcp test This only fixes the symptoms, not the real problem. Sometimes or consistently on some platforms a socket might need a moment before it can be written to.
32e67ab4c2 cleanup: use typedef for private message ID's in callback
7b1db6adc1 feat: add message IDs to private group messages
99e0bcc27d refactor: Observers/ignored peers can now send and receive custom packets
b3c3c49d26 fix: Disable IPv6 in Windows cross-compilation tests
e742deddff feat: Check hashes of Windows dependencies when cross-compiling
dfb9a0b02b fix: Test the current Windows Dockerfile, not an old Dockerhub image
14de93ccec chore: Use WineHQ's Wine as Debian Bookworm's crashes
ed37616249 docs: Update the Windows cross-compilation section
9bb79c174f cleanup: Remove a couple of unnecessary misc_tools dependencies
19475adb70 chore: Statically link OpenMP into the cracker fun util on Windows
1be311e51f feat: Build the fun utils when cross-compiling to Windows
88133f8446 chore: Strip Windows binaries
3cc0ae7535 refactor: Copy over all of the required static dependencies
c4fa8f7fb1 feat: Generate .def, .exp and .lib files when building for Windows
74bbac5363 feat: Let CMake create the dll instead of doing so ourselves
246642e9ae feat: Harden Windows cross-compilation
8d431c0d11 chore: Bump Windows build dependency versions
e519f7998b fix: Remove unnecessary wsock32 dependency on Windows
ed2b60c217 chore: Use a specific non-broken slimcc version.
d7f21010a1 chore: Update github actions.
e71a68b7f2 docs: Update the list of CMake options
77e08876ff chore: Remove mod and founder from group API naming scheme
12bc042767 docs: add the experimental api build option to INSTALL.md
e1fa5cae96 refactor: Rename Queries to Query to align with other enums.
be82a3ea30 fix: Correct type for conference offline peer numbers.
0627c36716 test: Add pkgsrc build.
92578afe4b test: Add FreeBSD VM action on GitHub.
52ece0f57b test: Build toxcore on NetBSD (VM).
3fe8ee2c11 chore: Only install tox_private.h on request.
9a8dfa06ab fix: save_compatibility_test failing on big-endian systems
86f5e55578 fix: Don't serve files from websockify.
710eb674a5 fix: Correctly pass extended public keys to group moderation code.
021db7031c refactor: Use `struct`s for extended public/secret keys.
a1e999fd80 chore: Compile libsodium reference implementation with compcert.
fbe3c19cf5 cleanup: correct a few nullable annotations
623e3ee5c3 cleanup: Don't use `memcpy` to cast arbitrary `struct`s to `uint8_t[]`.
c71567dc18 fix: Pass array, not array pointer, to `memcmp`.
9b46a08144 cleanup: Never pass `void*` directly to `memcpy`.
5d7b7a7bbc refactor: Use tox rng to seed the keypair generation.
961891d568 cleanup: Small improvements found by PVS Studio.
8201019f0d chore: Disable NGC saving by default, enable through Tox_Options.
5dd9ee3f65 cleanup: Replace pointer arithmetic with explicit `&arr[i]`.
ca4606d49d refactor: Use strong typedef for NGC peer id.
442213b722 cleanup: Simplify custom packet length check in NGC.
08d3393def fix: Correct a few potential null derefs in bootstrap daemon.
b9877b32b0 fix: Add missing memunlock of local variable when it goes out of scope.
dab5fe44b9 fix: Zero out stack-allocated secret key before return.
f058103299 refactor: Make prune_gc_sanctions_list more obviously correct.
3ba7a0dec9 docs: Add static analysis tool list to README.
8d0811a0f3 docs: Run prettier-markdown on markdown files.
969e3a2bfc refactor: Fix network test not using the strong typedef
93c83fbc7c refactor: Use strong typedef instead of struct for `Socket`.
9fe18b176f fix: Fix some false positive from PVS Studio.
7c44379ccb cleanup: Check that WINXP macro exists before comparing it.
5c93231bef refactor: Make tox mutex non-recursive.
aacff73939 docs: Fix up doxyfile.
d55fc85ff5 docs: Add more documentation to crypto_core.
5bdaaaedb6 refactor: Remove `Tox *` from `tox_dispatch`.
e202341e76 refactor: Don't rely on tox_dispatch passing tox in tests.
34df938f52 chore: Use C++ mode for clang-tidy.
8b05296a78 chore: Check that both gtest and gmock exist for tests.
42010660e1 test: Add slimcc compiler compatibility test.
b473630321 chore: Add some comments to the astyle config.
b7404f24f6 cleanup: Remove implicit bool conversions.
4e2dba4d9f chore: Reformat sources with astyle.
4359e3a6bc chore: Rename C++ headers to .hh suffixes.
0c05566e58 cleanup: Further `#include` cleanups.
8d29935b7a chore: Only check the bootstrap daemon checksum on release.
f70e588bc6 cleanup: Add more `const` where possible.
511bfe39c8 cleanup: Use Bazel modules to enforce proper `#include` hygiene.
1710a0d091 refactor: Move pack/unpack `IP_Port` from DHT into network module.
a975943564 chore: Really fix coverage docker image build.
c08409390f chore: Fix post-submit coverage image.
39aadf8922 fix: Don't use `memcmp` to compare `IP_Port`s.
d94246a906 fix: partially fix a bug that prevented group part messages from sending.
eeaa039222 chore: Fix rpm build; add a CI check for it.
8328449c1a chore: Speed up docker builds a bit by reducing layer count.
d6d67d56f3 cleanup: Add `const` where possible in auto tests.
6aa9e6850d cleanup: Minor cleanup of event unpack code.
bdf460a3a9 refactor: Rename `system_{memory,...}` to `os_{memory,...}`.
203e1af81e fix: a few off by one errors in group autotests
5c093c4888 cleanup: Remove all uses of `SIZEOF_VLA`.
662c2140f3 test: Add goblint static analyser.
8f07755834 cleanup: Use `memzero(x, s)` instead of `memset(x, 0, s)`.
a7258e40cf cleanup: Use explicit 0 instead of `PACKET_ID_PADDING`.
6370d0f15d cleanup: Expand the `Tox_Options` accessor macros.
14a1a0b9bd cleanup: Remove plan9 support.
a05dccad13 test: Add a simple new/delete test for Tox.
1cdcf938b9 cleanup: Add comment after every `#endif`.
ba99d4dc4b test: Fix comment I broke in the events test PR.
e07248debb refactor: Migrate auto_tests to new events API.
bdd42b5452 refactor: Add common msgpack array packer with callback.
3c659f5288 cleanup: Rename group to conference in groupav documentation.
89957be230 cleanup: Ensure handler params are named after callback params.
c650d9d345 refactor: Pass `this` pointer as first param to s11n callbacks.
e7fb91ddb8 refactor: Allow NULL pointers for byte arrays in events.
5e2c8cabc1 cleanup: make some improvements to group moderation test
259de4867e cleanup: Remove `bin_pack_{new,free}`.
21a8ff5895 cleanup: skip a do_gc iteration before removing peers marked for deletion
16809dc36e feat: Add dht_get_nodes_response event to the events system.
git-subtree-dir: external/toxcore/c-toxcore
git-subtree-split: b03b5712720de9a9901ea12fd741f177327a7021
2024-03-07 23:12:55 +01:00
|
|
|
int vc_queue_message(Mono_Time *mono_time, void *cs, struct RTPMessage *msg)
|
2023-07-25 11:53:09 +02:00
|
|
|
{
|
Squashed 'external/toxcore/c-toxcore/' changes from e2c01e457b..b03b571272
b03b571272 fix: flaky tcp test This only fixes the symptoms, not the real problem. Sometimes or consistently on some platforms a socket might need a moment before it can be written to.
32e67ab4c2 cleanup: use typedef for private message ID's in callback
7b1db6adc1 feat: add message IDs to private group messages
99e0bcc27d refactor: Observers/ignored peers can now send and receive custom packets
b3c3c49d26 fix: Disable IPv6 in Windows cross-compilation tests
e742deddff feat: Check hashes of Windows dependencies when cross-compiling
dfb9a0b02b fix: Test the current Windows Dockerfile, not an old Dockerhub image
14de93ccec chore: Use WineHQ's Wine as Debian Bookworm's crashes
ed37616249 docs: Update the Windows cross-compilation section
9bb79c174f cleanup: Remove a couple of unnecessary misc_tools dependencies
19475adb70 chore: Statically link OpenMP into the cracker fun util on Windows
1be311e51f feat: Build the fun utils when cross-compiling to Windows
88133f8446 chore: Strip Windows binaries
3cc0ae7535 refactor: Copy over all of the required static dependencies
c4fa8f7fb1 feat: Generate .def, .exp and .lib files when building for Windows
74bbac5363 feat: Let CMake create the dll instead of doing so ourselves
246642e9ae feat: Harden Windows cross-compilation
8d431c0d11 chore: Bump Windows build dependency versions
e519f7998b fix: Remove unnecessary wsock32 dependency on Windows
ed2b60c217 chore: Use a specific non-broken slimcc version.
d7f21010a1 chore: Update github actions.
e71a68b7f2 docs: Update the list of CMake options
77e08876ff chore: Remove mod and founder from group API naming scheme
12bc042767 docs: add the experimental api build option to INSTALL.md
e1fa5cae96 refactor: Rename Queries to Query to align with other enums.
be82a3ea30 fix: Correct type for conference offline peer numbers.
0627c36716 test: Add pkgsrc build.
92578afe4b test: Add FreeBSD VM action on GitHub.
52ece0f57b test: Build toxcore on NetBSD (VM).
3fe8ee2c11 chore: Only install tox_private.h on request.
9a8dfa06ab fix: save_compatibility_test failing on big-endian systems
86f5e55578 fix: Don't serve files from websockify.
710eb674a5 fix: Correctly pass extended public keys to group moderation code.
021db7031c refactor: Use `struct`s for extended public/secret keys.
a1e999fd80 chore: Compile libsodium reference implementation with compcert.
fbe3c19cf5 cleanup: correct a few nullable annotations
623e3ee5c3 cleanup: Don't use `memcpy` to cast arbitrary `struct`s to `uint8_t[]`.
c71567dc18 fix: Pass array, not array pointer, to `memcmp`.
9b46a08144 cleanup: Never pass `void*` directly to `memcpy`.
5d7b7a7bbc refactor: Use tox rng to seed the keypair generation.
961891d568 cleanup: Small improvements found by PVS Studio.
8201019f0d chore: Disable NGC saving by default, enable through Tox_Options.
5dd9ee3f65 cleanup: Replace pointer arithmetic with explicit `&arr[i]`.
ca4606d49d refactor: Use strong typedef for NGC peer id.
442213b722 cleanup: Simplify custom packet length check in NGC.
08d3393def fix: Correct a few potential null derefs in bootstrap daemon.
b9877b32b0 fix: Add missing memunlock of local variable when it goes out of scope.
dab5fe44b9 fix: Zero out stack-allocated secret key before return.
f058103299 refactor: Make prune_gc_sanctions_list more obviously correct.
3ba7a0dec9 docs: Add static analysis tool list to README.
8d0811a0f3 docs: Run prettier-markdown on markdown files.
969e3a2bfc refactor: Fix network test not using the strong typedef
93c83fbc7c refactor: Use strong typedef instead of struct for `Socket`.
9fe18b176f fix: Fix some false positive from PVS Studio.
7c44379ccb cleanup: Check that WINXP macro exists before comparing it.
5c93231bef refactor: Make tox mutex non-recursive.
aacff73939 docs: Fix up doxyfile.
d55fc85ff5 docs: Add more documentation to crypto_core.
5bdaaaedb6 refactor: Remove `Tox *` from `tox_dispatch`.
e202341e76 refactor: Don't rely on tox_dispatch passing tox in tests.
34df938f52 chore: Use C++ mode for clang-tidy.
8b05296a78 chore: Check that both gtest and gmock exist for tests.
42010660e1 test: Add slimcc compiler compatibility test.
b473630321 chore: Add some comments to the astyle config.
b7404f24f6 cleanup: Remove implicit bool conversions.
4e2dba4d9f chore: Reformat sources with astyle.
4359e3a6bc chore: Rename C++ headers to .hh suffixes.
0c05566e58 cleanup: Further `#include` cleanups.
8d29935b7a chore: Only check the bootstrap daemon checksum on release.
f70e588bc6 cleanup: Add more `const` where possible.
511bfe39c8 cleanup: Use Bazel modules to enforce proper `#include` hygiene.
1710a0d091 refactor: Move pack/unpack `IP_Port` from DHT into network module.
a975943564 chore: Really fix coverage docker image build.
c08409390f chore: Fix post-submit coverage image.
39aadf8922 fix: Don't use `memcmp` to compare `IP_Port`s.
d94246a906 fix: partially fix a bug that prevented group part messages from sending.
eeaa039222 chore: Fix rpm build; add a CI check for it.
8328449c1a chore: Speed up docker builds a bit by reducing layer count.
d6d67d56f3 cleanup: Add `const` where possible in auto tests.
6aa9e6850d cleanup: Minor cleanup of event unpack code.
bdf460a3a9 refactor: Rename `system_{memory,...}` to `os_{memory,...}`.
203e1af81e fix: a few off by one errors in group autotests
5c093c4888 cleanup: Remove all uses of `SIZEOF_VLA`.
662c2140f3 test: Add goblint static analyser.
8f07755834 cleanup: Use `memzero(x, s)` instead of `memset(x, 0, s)`.
a7258e40cf cleanup: Use explicit 0 instead of `PACKET_ID_PADDING`.
6370d0f15d cleanup: Expand the `Tox_Options` accessor macros.
14a1a0b9bd cleanup: Remove plan9 support.
a05dccad13 test: Add a simple new/delete test for Tox.
1cdcf938b9 cleanup: Add comment after every `#endif`.
ba99d4dc4b test: Fix comment I broke in the events test PR.
e07248debb refactor: Migrate auto_tests to new events API.
bdd42b5452 refactor: Add common msgpack array packer with callback.
3c659f5288 cleanup: Rename group to conference in groupav documentation.
89957be230 cleanup: Ensure handler params are named after callback params.
c650d9d345 refactor: Pass `this` pointer as first param to s11n callbacks.
e7fb91ddb8 refactor: Allow NULL pointers for byte arrays in events.
5e2c8cabc1 cleanup: make some improvements to group moderation test
259de4867e cleanup: Remove `bin_pack_{new,free}`.
21a8ff5895 cleanup: skip a do_gc iteration before removing peers marked for deletion
16809dc36e feat: Add dht_get_nodes_response event to the events system.
git-subtree-dir: external/toxcore/c-toxcore
git-subtree-split: b03b5712720de9a9901ea12fd741f177327a7021
2024-03-07 23:12:55 +01:00
|
|
|
VCSession *vc = (VCSession *)cs;
|
2024-01-09 16:39:05 +01:00
|
|
|
|
2023-07-25 11:53:09 +02:00
|
|
|
/* This function is called with complete messages
|
|
|
|
* they have already been assembled.
|
|
|
|
* this function gets called from handle_rtp_packet() and handle_rtp_packet_v3()
|
|
|
|
*/
|
2024-01-09 16:39:05 +01:00
|
|
|
if (vc == nullptr || msg == nullptr) {
|
2023-07-25 11:53:09 +02:00
|
|
|
free(msg);
|
|
|
|
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
const struct RTPHeader *const header = &msg->header;
|
|
|
|
|
|
|
|
if (msg->header.pt == (RTP_TYPE_VIDEO + 2) % 128) {
|
|
|
|
LOGGER_WARNING(vc->log, "Got dummy!");
|
|
|
|
free(msg);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (msg->header.pt != RTP_TYPE_VIDEO % 128) {
|
|
|
|
LOGGER_WARNING(vc->log, "Invalid payload type! pt=%d", (int)msg->header.pt);
|
|
|
|
free(msg);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
pthread_mutex_lock(vc->queue_mutex);
|
|
|
|
|
|
|
|
if ((header->flags & RTP_LARGE_FRAME) != 0 && header->pt == RTP_TYPE_VIDEO % 128) {
|
|
|
|
LOGGER_DEBUG(vc->log, "rb_write msg->len=%d b0=%d b1=%d", (int)msg->len, (int)msg->data[0], (int)msg->data[1]);
|
|
|
|
}
|
|
|
|
|
|
|
|
free(rb_write(vc->vbuf_raw, msg));
|
|
|
|
|
|
|
|
/* Calculate time it took for peer to send us this frame */
|
|
|
|
const uint32_t t_lcfd = current_time_monotonic(mono_time) - vc->linfts;
|
|
|
|
vc->lcfd = t_lcfd > 100 ? vc->lcfd : t_lcfd;
|
|
|
|
vc->linfts = current_time_monotonic(mono_time);
|
|
|
|
pthread_mutex_unlock(vc->queue_mutex);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
int vc_reconfigure_encoder(VCSession *vc, uint32_t bit_rate, uint16_t width, uint16_t height, int16_t kf_max_dist)
|
|
|
|
{
|
|
|
|
if (vc == nullptr) {
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
vpx_codec_enc_cfg_t cfg2 = *vc->encoder->config.enc;
|
|
|
|
|
|
|
|
if (cfg2.rc_target_bitrate == bit_rate && cfg2.g_w == width && cfg2.g_h == height && kf_max_dist == -1) {
|
|
|
|
return 0; /* Nothing changed */
|
|
|
|
}
|
|
|
|
|
|
|
|
if (cfg2.g_w == width && cfg2.g_h == height && kf_max_dist == -1) {
|
|
|
|
/* Only bit rate changed */
|
|
|
|
LOGGER_INFO(vc->log, "bitrate change from: %u to: %u", (uint32_t)cfg2.rc_target_bitrate, (uint32_t)bit_rate);
|
|
|
|
cfg2.rc_target_bitrate = bit_rate;
|
|
|
|
const vpx_codec_err_t rc = vpx_codec_enc_config_set(vc->encoder, &cfg2);
|
|
|
|
|
|
|
|
if (rc != VPX_CODEC_OK) {
|
|
|
|
LOGGER_ERROR(vc->log, "Failed to set encoder control setting: %s", vpx_codec_err_to_string(rc));
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
/* Resolution is changed, must reinitialize encoder since libvpx v1.4 doesn't support
|
|
|
|
* reconfiguring encoder to use resolutions greater than initially set.
|
|
|
|
*/
|
|
|
|
LOGGER_DEBUG(vc->log, "Have to reinitialize vpx encoder on session %p", (void *)vc);
|
|
|
|
vpx_codec_ctx_t new_c;
|
|
|
|
vpx_codec_enc_cfg_t cfg;
|
|
|
|
vc_init_encoder_cfg(vc->log, &cfg, kf_max_dist);
|
|
|
|
cfg.rc_target_bitrate = bit_rate;
|
|
|
|
cfg.g_w = width;
|
|
|
|
cfg.g_h = height;
|
|
|
|
|
|
|
|
LOGGER_DEBUG(vc->log, "Using VP8 codec for encoder");
|
|
|
|
vpx_codec_err_t rc = vpx_codec_enc_init(&new_c, video_codec_encoder_interface(), &cfg, VPX_CODEC_USE_FRAME_THREADING);
|
|
|
|
|
|
|
|
if (rc != VPX_CODEC_OK) {
|
|
|
|
LOGGER_ERROR(vc->log, "Failed to initialize encoder: %s", vpx_codec_err_to_string(rc));
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
const int cpu_used_value = VP8E_SET_CPUUSED_VALUE;
|
|
|
|
|
|
|
|
rc = vpx_codec_control(&new_c, VP8E_SET_CPUUSED, cpu_used_value);
|
|
|
|
|
|
|
|
if (rc != VPX_CODEC_OK) {
|
|
|
|
LOGGER_ERROR(vc->log, "Failed to set encoder control setting: %s", vpx_codec_err_to_string(rc));
|
|
|
|
vpx_codec_destroy(&new_c);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
vpx_codec_destroy(vc->encoder);
|
|
|
|
memcpy(vc->encoder, &new_c, sizeof(new_c));
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|