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 "audio.h"
|
|
|
|
|
|
|
|
#include <assert.h>
|
|
|
|
#include <stdlib.h>
|
|
|
|
#include <string.h>
|
|
|
|
|
|
|
|
#include "rtp.h"
|
|
|
|
|
|
|
|
#include "../toxcore/ccompat.h"
|
|
|
|
#include "../toxcore/logger.h"
|
|
|
|
#include "../toxcore/mono_time.h"
|
2024-11-09 13:44:30 +01:00
|
|
|
#include "../toxcore/network.h"
|
2023-07-25 11:53:09 +02:00
|
|
|
|
|
|
|
static struct JitterBuffer *jbuf_new(uint32_t capacity);
|
|
|
|
static void jbuf_clear(struct JitterBuffer *q);
|
|
|
|
static void jbuf_free(struct JitterBuffer *q);
|
|
|
|
static int jbuf_write(const Logger *log, struct JitterBuffer *q, struct RTPMessage *m);
|
|
|
|
static struct RTPMessage *jbuf_read(struct JitterBuffer *q, int32_t *success);
|
|
|
|
static OpusEncoder *create_audio_encoder(const Logger *log, uint32_t bit_rate, uint32_t sampling_rate,
|
|
|
|
uint8_t channel_count);
|
|
|
|
static bool reconfigure_audio_encoder(const Logger *log, OpusEncoder **e, uint32_t new_br, uint32_t new_sr,
|
|
|
|
uint8_t new_ch, uint32_t *old_br, uint32_t *old_sr, uint8_t *old_ch);
|
|
|
|
static bool reconfigure_audio_decoder(ACSession *ac, uint32_t sampling_rate, uint8_t channels);
|
|
|
|
|
2024-11-09 13:44:30 +01:00
|
|
|
|
|
|
|
|
2023-07-25 11:53:09 +02:00
|
|
|
ACSession *ac_new(Mono_Time *mono_time, const Logger *log, ToxAV *av, uint32_t friend_number,
|
|
|
|
toxav_audio_receive_frame_cb *cb, void *cb_data)
|
|
|
|
{
|
|
|
|
ACSession *ac = (ACSession *)calloc(1, sizeof(ACSession));
|
|
|
|
|
|
|
|
if (ac == nullptr) {
|
|
|
|
LOGGER_WARNING(log, "Allocation failed! Application might misbehave!");
|
|
|
|
return nullptr;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (create_recursive_mutex(ac->queue_mutex) != 0) {
|
|
|
|
LOGGER_WARNING(log, "Failed to create recursive mutex!");
|
|
|
|
free(ac);
|
|
|
|
return nullptr;
|
|
|
|
}
|
|
|
|
|
|
|
|
int status;
|
|
|
|
ac->decoder = opus_decoder_create(AUDIO_DECODER_START_SAMPLE_RATE, AUDIO_DECODER_START_CHANNEL_COUNT, &status);
|
|
|
|
|
|
|
|
if (status != OPUS_OK) {
|
|
|
|
LOGGER_ERROR(log, "Error while starting audio decoder: %s", opus_strerror(status));
|
|
|
|
goto BASE_CLEANUP;
|
|
|
|
}
|
|
|
|
|
|
|
|
ac->j_buf = jbuf_new(AUDIO_JITTERBUFFER_COUNT);
|
|
|
|
|
|
|
|
if (ac->j_buf == nullptr) {
|
|
|
|
LOGGER_WARNING(log, "Jitter buffer creaton failed!");
|
|
|
|
opus_decoder_destroy(ac->decoder);
|
|
|
|
goto BASE_CLEANUP;
|
|
|
|
}
|
|
|
|
|
|
|
|
ac->mono_time = mono_time;
|
|
|
|
ac->log = log;
|
|
|
|
|
|
|
|
/* Initialize encoders with default values */
|
|
|
|
ac->encoder = create_audio_encoder(log, AUDIO_START_BITRATE, AUDIO_START_SAMPLE_RATE, AUDIO_START_CHANNEL_COUNT);
|
|
|
|
|
|
|
|
if (ac->encoder == nullptr) {
|
|
|
|
goto DECODER_CLEANUP;
|
|
|
|
}
|
|
|
|
|
|
|
|
ac->le_bit_rate = AUDIO_START_BITRATE;
|
|
|
|
ac->le_sample_rate = AUDIO_START_SAMPLE_RATE;
|
|
|
|
ac->le_channel_count = AUDIO_START_CHANNEL_COUNT;
|
|
|
|
|
|
|
|
ac->ld_channel_count = AUDIO_DECODER_START_CHANNEL_COUNT;
|
|
|
|
ac->ld_sample_rate = AUDIO_DECODER_START_SAMPLE_RATE;
|
|
|
|
ac->ldrts = 0; /* Make it possible to reconfigure straight away */
|
|
|
|
|
|
|
|
/* These need to be set in order to properly
|
|
|
|
* do error correction with opus */
|
|
|
|
ac->lp_frame_duration = AUDIO_MAX_FRAME_DURATION_MS;
|
|
|
|
ac->lp_sampling_rate = AUDIO_DECODER_START_SAMPLE_RATE;
|
|
|
|
ac->lp_channel_count = AUDIO_DECODER_START_CHANNEL_COUNT;
|
|
|
|
|
|
|
|
ac->av = av;
|
|
|
|
ac->friend_number = friend_number;
|
|
|
|
ac->acb = cb;
|
|
|
|
ac->acb_user_data = cb_data;
|
|
|
|
|
|
|
|
return ac;
|
|
|
|
|
|
|
|
DECODER_CLEANUP:
|
|
|
|
opus_decoder_destroy(ac->decoder);
|
|
|
|
jbuf_free((struct JitterBuffer *)ac->j_buf);
|
|
|
|
BASE_CLEANUP:
|
|
|
|
pthread_mutex_destroy(ac->queue_mutex);
|
|
|
|
free(ac);
|
|
|
|
return nullptr;
|
|
|
|
}
|
|
|
|
|
|
|
|
void ac_kill(ACSession *ac)
|
|
|
|
{
|
|
|
|
if (ac == nullptr) {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
opus_encoder_destroy(ac->encoder);
|
|
|
|
opus_decoder_destroy(ac->decoder);
|
|
|
|
jbuf_free((struct JitterBuffer *)ac->j_buf);
|
|
|
|
|
|
|
|
pthread_mutex_destroy(ac->queue_mutex);
|
|
|
|
|
|
|
|
LOGGER_DEBUG(ac->log, "Terminated audio handler: %p", (void *)ac);
|
|
|
|
free(ac);
|
|
|
|
}
|
|
|
|
|
|
|
|
void ac_iterate(ACSession *ac)
|
|
|
|
{
|
|
|
|
if (ac == nullptr) {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* TODO: fix this and jitter buffering */
|
|
|
|
|
|
|
|
/* Enough space for the maximum frame size (120 ms 48 KHz stereo audio) */
|
|
|
|
int16_t *temp_audio_buffer = (int16_t *)malloc(AUDIO_MAX_BUFFER_SIZE_PCM16 * AUDIO_MAX_CHANNEL_COUNT * sizeof(int16_t));
|
|
|
|
|
|
|
|
if (temp_audio_buffer == nullptr) {
|
|
|
|
LOGGER_ERROR(ac->log, "Failed to allocate memory for audio buffer");
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
pthread_mutex_lock(ac->queue_mutex);
|
|
|
|
struct JitterBuffer *const j_buf = (struct JitterBuffer *)ac->j_buf;
|
|
|
|
|
|
|
|
int rc = 0;
|
|
|
|
|
|
|
|
for (struct RTPMessage *msg = jbuf_read(j_buf, &rc); msg != nullptr || rc == 2; msg = jbuf_read(j_buf, &rc)) {
|
|
|
|
pthread_mutex_unlock(ac->queue_mutex);
|
|
|
|
|
|
|
|
if (rc == 2) {
|
|
|
|
LOGGER_DEBUG(ac->log, "OPUS correction");
|
|
|
|
const int fs = (ac->lp_sampling_rate * ac->lp_frame_duration) / 1000;
|
|
|
|
rc = opus_decode(ac->decoder, nullptr, 0, temp_audio_buffer, fs, 1);
|
|
|
|
} else {
|
|
|
|
assert(msg->len > 4);
|
|
|
|
|
|
|
|
/* Pick up sampling rate from packet */
|
|
|
|
memcpy(&ac->lp_sampling_rate, msg->data, 4);
|
|
|
|
ac->lp_sampling_rate = net_ntohl(ac->lp_sampling_rate);
|
|
|
|
|
|
|
|
ac->lp_channel_count = opus_packet_get_nb_channels(msg->data + 4);
|
|
|
|
|
2024-11-09 13:44:30 +01:00
|
|
|
/** NOTE: even though OPUS supports decoding mono frames with stereo decoder and vice versa,
|
|
|
|
* it didn't work quite well.
|
|
|
|
*/
|
2023-07-25 11:53:09 +02:00
|
|
|
if (!reconfigure_audio_decoder(ac, ac->lp_sampling_rate, ac->lp_channel_count)) {
|
|
|
|
LOGGER_WARNING(ac->log, "Failed to reconfigure decoder!");
|
|
|
|
free(msg);
|
|
|
|
pthread_mutex_lock(ac->queue_mutex);
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* frame_size = opus_decode(dec, packet, len, decoded, max_size, 0);
|
|
|
|
* where
|
|
|
|
* packet is the byte array containing the compressed data
|
|
|
|
* len is the exact number of bytes contained in the packet
|
|
|
|
* decoded is the decoded audio data in opus_int16 (or float for opus_decode_float())
|
|
|
|
* max_size is the max duration of the frame in samples (per channel) that can fit
|
|
|
|
* into the decoded_frame array
|
|
|
|
*/
|
|
|
|
rc = opus_decode(ac->decoder, msg->data + 4, msg->len - 4, temp_audio_buffer, 5760, 0);
|
|
|
|
free(msg);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (rc < 0) {
|
|
|
|
LOGGER_WARNING(ac->log, "Decoding error: %s", opus_strerror(rc));
|
|
|
|
} else if (ac->acb != nullptr) {
|
|
|
|
ac->lp_frame_duration = (rc * 1000) / ac->lp_sampling_rate;
|
|
|
|
|
|
|
|
ac->acb(ac->av, ac->friend_number, temp_audio_buffer, rc, ac->lp_channel_count,
|
|
|
|
ac->lp_sampling_rate, ac->acb_user_data);
|
|
|
|
}
|
|
|
|
|
|
|
|
free(temp_audio_buffer);
|
|
|
|
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
pthread_mutex_unlock(ac->queue_mutex);
|
|
|
|
|
|
|
|
free(temp_audio_buffer);
|
|
|
|
}
|
|
|
|
|
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 ac_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
|
|
|
ACSession *ac = (ACSession *)cs;
|
2024-01-09 16:39:05 +01:00
|
|
|
|
|
|
|
if (ac == nullptr || msg == nullptr) {
|
2023-07-25 11:53:09 +02:00
|
|
|
free(msg);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
if ((msg->header.pt & 0x7f) == (RTP_TYPE_AUDIO + 2) % 128) {
|
|
|
|
LOGGER_WARNING(ac->log, "Got dummy!");
|
|
|
|
free(msg);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
if ((msg->header.pt & 0x7f) != RTP_TYPE_AUDIO % 128) {
|
|
|
|
LOGGER_WARNING(ac->log, "Invalid payload type!");
|
|
|
|
free(msg);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
pthread_mutex_lock(ac->queue_mutex);
|
|
|
|
const int rc = jbuf_write(ac->log, (struct JitterBuffer *)ac->j_buf, msg);
|
|
|
|
pthread_mutex_unlock(ac->queue_mutex);
|
|
|
|
|
|
|
|
if (rc == -1) {
|
|
|
|
LOGGER_WARNING(ac->log, "Could not queue the message!");
|
|
|
|
free(msg);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
int ac_reconfigure_encoder(ACSession *ac, uint32_t bit_rate, uint32_t sampling_rate, uint8_t channels)
|
|
|
|
{
|
|
|
|
if (ac == nullptr || !reconfigure_audio_encoder(
|
|
|
|
ac->log, &ac->encoder, bit_rate,
|
|
|
|
sampling_rate, channels,
|
|
|
|
&ac->le_bit_rate,
|
|
|
|
&ac->le_sample_rate,
|
|
|
|
&ac->le_channel_count)) {
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
struct JitterBuffer {
|
|
|
|
struct RTPMessage **queue;
|
|
|
|
uint32_t size;
|
|
|
|
uint32_t capacity;
|
|
|
|
uint16_t bottom;
|
|
|
|
uint16_t top;
|
|
|
|
};
|
|
|
|
|
|
|
|
static struct JitterBuffer *jbuf_new(uint32_t capacity)
|
|
|
|
{
|
|
|
|
unsigned int size = 1;
|
|
|
|
|
|
|
|
while (size <= (capacity * 4)) {
|
|
|
|
size *= 2;
|
|
|
|
}
|
|
|
|
|
|
|
|
struct JitterBuffer *q = (struct JitterBuffer *)calloc(1, sizeof(struct JitterBuffer));
|
|
|
|
|
|
|
|
if (q == nullptr) {
|
|
|
|
return nullptr;
|
|
|
|
}
|
|
|
|
|
|
|
|
q->queue = (struct RTPMessage **)calloc(size, sizeof(struct RTPMessage *));
|
|
|
|
|
|
|
|
if (q->queue == nullptr) {
|
|
|
|
free(q);
|
|
|
|
return nullptr;
|
|
|
|
}
|
|
|
|
|
|
|
|
q->size = size;
|
|
|
|
q->capacity = capacity;
|
|
|
|
return q;
|
|
|
|
}
|
2024-11-09 13:44:30 +01:00
|
|
|
|
2023-07-25 11:53:09 +02:00
|
|
|
static void jbuf_clear(struct JitterBuffer *q)
|
|
|
|
{
|
|
|
|
while (q->bottom != q->top) {
|
|
|
|
free(q->queue[q->bottom % q->size]);
|
|
|
|
q->queue[q->bottom % q->size] = nullptr;
|
|
|
|
++q->bottom;
|
|
|
|
}
|
|
|
|
}
|
2024-11-09 13:44:30 +01:00
|
|
|
|
2023-07-25 11:53:09 +02:00
|
|
|
static void jbuf_free(struct JitterBuffer *q)
|
|
|
|
{
|
|
|
|
if (q == nullptr) {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
jbuf_clear(q);
|
|
|
|
free(q->queue);
|
|
|
|
free(q);
|
|
|
|
}
|
2024-11-09 13:44:30 +01:00
|
|
|
|
|
|
|
/*
|
|
|
|
* if -1 is returned the RTPMessage m needs to be free'd by the caller
|
|
|
|
* if 0 is returned the RTPMessage m is stored in the ringbuffer and must NOT be freed by the caller
|
|
|
|
*/
|
2023-07-25 11:53:09 +02:00
|
|
|
static int jbuf_write(const Logger *log, struct JitterBuffer *q, struct RTPMessage *m)
|
|
|
|
{
|
|
|
|
const uint16_t sequnum = m->header.sequnum;
|
|
|
|
|
|
|
|
const unsigned int num = sequnum % q->size;
|
|
|
|
|
|
|
|
if ((uint32_t)(sequnum - q->bottom) > q->size) {
|
|
|
|
LOGGER_DEBUG(log, "Clearing filled jitter buffer: %p", (void *)q);
|
|
|
|
|
|
|
|
jbuf_clear(q);
|
|
|
|
q->bottom = sequnum - q->capacity;
|
|
|
|
q->queue[num] = m;
|
|
|
|
q->top = sequnum + 1;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (q->queue[num] != nullptr) {
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
q->queue[num] = m;
|
|
|
|
|
|
|
|
if ((sequnum - q->bottom) >= (q->top - q->bottom)) {
|
|
|
|
q->top = sequnum + 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
2024-11-09 13:44:30 +01:00
|
|
|
|
2023-07-25 11:53:09 +02:00
|
|
|
static struct RTPMessage *jbuf_read(struct JitterBuffer *q, int32_t *success)
|
|
|
|
{
|
|
|
|
if (q->top == q->bottom) {
|
|
|
|
*success = 0;
|
|
|
|
return nullptr;
|
|
|
|
}
|
|
|
|
|
|
|
|
const unsigned int num = q->bottom % q->size;
|
|
|
|
|
|
|
|
if (q->queue[num] != nullptr) {
|
|
|
|
struct RTPMessage *ret = q->queue[num];
|
|
|
|
q->queue[num] = nullptr;
|
|
|
|
++q->bottom;
|
|
|
|
*success = 1;
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
if ((uint32_t)(q->top - q->bottom) > q->capacity) {
|
|
|
|
++q->bottom;
|
|
|
|
*success = 2;
|
|
|
|
return nullptr;
|
|
|
|
}
|
|
|
|
|
|
|
|
*success = 0;
|
|
|
|
return nullptr;
|
|
|
|
}
|
|
|
|
static OpusEncoder *create_audio_encoder(const Logger *log, uint32_t bit_rate, uint32_t sampling_rate,
|
|
|
|
uint8_t channel_count)
|
|
|
|
{
|
|
|
|
int status = OPUS_OK;
|
|
|
|
/*
|
|
|
|
* OPUS_APPLICATION_VOIP Process signal for improved speech intelligibility
|
|
|
|
* OPUS_APPLICATION_AUDIO Favor faithfulness to the original input
|
|
|
|
* OPUS_APPLICATION_RESTRICTED_LOWDELAY Configure the minimum possible coding delay
|
|
|
|
*/
|
|
|
|
OpusEncoder *rc = opus_encoder_create(sampling_rate, channel_count, OPUS_APPLICATION_VOIP, &status);
|
|
|
|
|
|
|
|
if (status != OPUS_OK) {
|
|
|
|
LOGGER_ERROR(log, "Error while starting audio encoder: %s", opus_strerror(status));
|
|
|
|
return nullptr;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Rates from 500 to 512000 bits per second are meaningful as well as the special
|
|
|
|
* values OPUS_BITRATE_AUTO and OPUS_BITRATE_MAX. The value OPUS_BITRATE_MAX can
|
|
|
|
* be used to cause the codec to use as much rate as it can, which is useful for
|
|
|
|
* controlling the rate by adjusting the output buffer size.
|
|
|
|
*
|
|
|
|
* Parameters:
|
|
|
|
* `[in]` `x` `opus_int32`: bitrate in bits per second.
|
|
|
|
*/
|
|
|
|
status = opus_encoder_ctl(rc, OPUS_SET_BITRATE(bit_rate));
|
|
|
|
|
|
|
|
if (status != OPUS_OK) {
|
|
|
|
LOGGER_ERROR(log, "Error while setting encoder ctl: %s", opus_strerror(status));
|
|
|
|
goto FAILURE;
|
|
|
|
}
|
|
|
|
|
2024-09-22 12:48:22 +02:00
|
|
|
/*
|
|
|
|
* The libopus library defaults to VBR, which is unsafe in any VoIP environment
|
|
|
|
* (see for example doi:10.1109/SP.2011.34). Switching to CBR very slightly
|
|
|
|
* decreases audio quality at lower bitrates.
|
|
|
|
*
|
|
|
|
* Parameters:
|
|
|
|
* `[in]` `x` `opus_int32`: Whether to use VBR mode, 1 (VBR) is default
|
|
|
|
*/
|
|
|
|
status = opus_encoder_ctl(rc, OPUS_SET_VBR(0));
|
|
|
|
|
|
|
|
if (status != OPUS_OK) {
|
|
|
|
LOGGER_ERROR(log, "Error while setting encoder ctl: %s", opus_strerror(status));
|
|
|
|
goto FAILURE;
|
|
|
|
}
|
|
|
|
|
2023-07-25 11:53:09 +02:00
|
|
|
/*
|
|
|
|
* Configures the encoder's use of inband forward error correction.
|
|
|
|
* Note:
|
|
|
|
* This is only applicable to the LPC layer
|
|
|
|
* Parameters:
|
|
|
|
* `[in]` `x` `int`: FEC flag, 0 (disabled) is default
|
|
|
|
*/
|
|
|
|
/* Enable in-band forward error correction in codec */
|
|
|
|
status = opus_encoder_ctl(rc, OPUS_SET_INBAND_FEC(1));
|
|
|
|
|
|
|
|
if (status != OPUS_OK) {
|
|
|
|
LOGGER_ERROR(log, "Error while setting encoder ctl: %s", opus_strerror(status));
|
|
|
|
goto FAILURE;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Configures the encoder's expected packet loss percentage.
|
|
|
|
* Higher values with trigger progressively more loss resistant behavior in
|
|
|
|
* the encoder at the expense of quality at a given bitrate in the lossless case,
|
|
|
|
* but greater quality under loss.
|
|
|
|
* Parameters:
|
|
|
|
* `[in]` `x` `int`: Loss percentage in the range 0-100, inclusive.
|
|
|
|
*/
|
|
|
|
/* Make codec resistant to up to 10% packet loss
|
|
|
|
* NOTE This could also be adjusted on the fly, rather than hard-coded,
|
|
|
|
* with feedback from the receiving client.
|
|
|
|
*/
|
|
|
|
status = opus_encoder_ctl(rc, OPUS_SET_PACKET_LOSS_PERC(AUDIO_OPUS_PACKET_LOSS_PERC));
|
|
|
|
|
|
|
|
if (status != OPUS_OK) {
|
|
|
|
LOGGER_ERROR(log, "Error while setting encoder ctl: %s", opus_strerror(status));
|
|
|
|
goto FAILURE;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Configures the encoder's computational complexity.
|
|
|
|
*
|
|
|
|
* The supported range is 0-10 inclusive with 10 representing the highest complexity.
|
|
|
|
* The default value is 10.
|
|
|
|
*
|
|
|
|
* Parameters:
|
|
|
|
* `[in]` `x` `int`: 0-10, inclusive
|
|
|
|
*/
|
|
|
|
/* Set algorithm to the highest complexity, maximizing compression */
|
|
|
|
status = opus_encoder_ctl(rc, OPUS_SET_COMPLEXITY(AUDIO_OPUS_COMPLEXITY));
|
|
|
|
|
|
|
|
if (status != OPUS_OK) {
|
|
|
|
LOGGER_ERROR(log, "Error while setting encoder ctl: %s", opus_strerror(status));
|
|
|
|
goto FAILURE;
|
|
|
|
}
|
|
|
|
|
|
|
|
return rc;
|
|
|
|
|
|
|
|
FAILURE:
|
|
|
|
opus_encoder_destroy(rc);
|
|
|
|
return nullptr;
|
|
|
|
}
|
|
|
|
|
|
|
|
static bool reconfigure_audio_encoder(const Logger *log, OpusEncoder **e, uint32_t new_br, uint32_t new_sr,
|
|
|
|
uint8_t new_ch, uint32_t *old_br, uint32_t *old_sr, uint8_t *old_ch)
|
|
|
|
{
|
|
|
|
/* Values are checked in toxav.c */
|
|
|
|
if (*old_sr != new_sr || *old_ch != new_ch) {
|
|
|
|
OpusEncoder *new_encoder = create_audio_encoder(log, new_br, new_sr, new_ch);
|
|
|
|
|
|
|
|
if (new_encoder == nullptr) {
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
opus_encoder_destroy(*e);
|
|
|
|
*e = new_encoder;
|
|
|
|
} else if (*old_br == new_br) {
|
|
|
|
return true; /* Nothing changed */
|
|
|
|
}
|
|
|
|
|
|
|
|
const int status = opus_encoder_ctl(*e, OPUS_SET_BITRATE(new_br));
|
|
|
|
|
|
|
|
if (status != OPUS_OK) {
|
|
|
|
LOGGER_ERROR(log, "Error while setting encoder ctl: %s", opus_strerror(status));
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
*old_br = new_br;
|
|
|
|
*old_sr = new_sr;
|
|
|
|
*old_ch = new_ch;
|
|
|
|
|
|
|
|
LOGGER_DEBUG(log, "Reconfigured audio encoder br: %d sr: %d cc:%d", new_br, new_sr, new_ch);
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
static bool reconfigure_audio_decoder(ACSession *ac, uint32_t sampling_rate, uint8_t channels)
|
|
|
|
{
|
|
|
|
if (sampling_rate != ac->ld_sample_rate || channels != ac->ld_channel_count) {
|
|
|
|
if (current_time_monotonic(ac->mono_time) - ac->ldrts < 500) {
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
int status;
|
|
|
|
OpusDecoder *new_dec = opus_decoder_create(sampling_rate, channels, &status);
|
|
|
|
|
|
|
|
if (status != OPUS_OK) {
|
|
|
|
LOGGER_ERROR(ac->log, "Error while starting audio decoder(%d %d): %s", sampling_rate, channels, opus_strerror(status));
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
ac->ld_sample_rate = sampling_rate;
|
|
|
|
ac->ld_channel_count = channels;
|
|
|
|
ac->ldrts = current_time_monotonic(ac->mono_time);
|
|
|
|
|
|
|
|
opus_decoder_destroy(ac->decoder);
|
|
|
|
ac->decoder = new_dec;
|
|
|
|
|
|
|
|
LOGGER_DEBUG(ac->log, "Reconfigured audio decoder sr: %d cc: %d", sampling_rate, channels);
|
|
|
|
}
|
|
|
|
|
|
|
|
return true;
|
|
|
|
}
|