Squashed 'external/toxcore/c-toxcore/' changes from 1828c5356..c9cdae001
c9cdae001 fix(toxav): remove extra copy of video frame on encode 4f6d4546b test: Improve the fake network library. a2581e700 refactor(toxcore): generate `Friend_Request` and `Dht_Nodes_Response` 2aaa11770 refactor(toxcore): use Tox_Memory in generated events 5c367452b test(toxcore): fix incorrect mutex in tox_scenario_get_time 8f92e710f perf: Add a timed limit of number of cookie requests. 695b6417a test: Add some more simulated network support. 815ae9ce9 test(toxcore): fix thread-safety in scenario framework 6d85c754e test(toxcore): add unit tests for net_crypto 9c22e79cc test(support): add SimulatedEnvironment for deterministic testing f34fcb195 chore: Update windows Dockerfile to debian stable (trixie). ece0e8980 fix(group_moderation): allow validating unsorted sanction list signatures a4fa754d7 refactor: rename struct Packet to struct Net_Packet d6f330f85 cleanup: Fix some warnings from coverity. e206bffa2 fix(group_chats): fix sync packets reverting topics 0e4715598 test: Add new scenario testing framework. 668291f44 refactor(toxcore): decouple Network_Funcs from sockaddr via IP_Port fc4396cef fix: potential division by zero in toxav and unsafe hex parsing 8e8b352ab refactor: Add nullable annotations to struct members. 7740bb421 refactor: decouple net_crypto from DHT 1936d4296 test: add benchmark for toxav audio and video 46bfdc2df fix: correct printf format specifiers for unsigned integers REVERT: 1828c5356 fix(toxav): remove extra copy of video frame on encode git-subtree-dir: external/toxcore/c-toxcore git-subtree-split: c9cdae001341e701fca980c9bb9febfeb95d2902
This commit is contained in:
37
toxav/msi.h
37
toxav/msi.h
@@ -6,6 +6,7 @@
|
||||
#define C_TOXCORE_TOXAV_MSI_H
|
||||
|
||||
#include <pthread.h>
|
||||
#include <stddef.h>
|
||||
#include <stdint.h>
|
||||
|
||||
#include "../toxcore/logger.h"
|
||||
@@ -64,19 +65,19 @@ typedef enum MSICallbackID {
|
||||
* The call struct. Please do not modify outside msi.c
|
||||
*/
|
||||
typedef struct MSICall {
|
||||
struct MSISession *session; /* Session pointer */
|
||||
struct MSISession *_Nonnull session; /* Session pointer */
|
||||
|
||||
MSICallState state;
|
||||
uint8_t peer_capabilities; /* Peer capabilities */
|
||||
uint8_t self_capabilities; /* Self capabilities */
|
||||
uint16_t peer_vfpsz; /* Video frame piece size */
|
||||
uint32_t friend_number; /* Index of this call in MSISession */
|
||||
MSIError error; /* Last error */
|
||||
MSICallState state;
|
||||
uint8_t peer_capabilities; /* Peer capabilities */
|
||||
uint8_t self_capabilities; /* Self capabilities */
|
||||
uint16_t peer_vfpsz; /* Video frame piece size */
|
||||
uint32_t friend_number; /* Index of this call in MSISession */
|
||||
MSIError error; /* Last error */
|
||||
|
||||
void *user_data; /* Pointer to av call handler */
|
||||
void *_Nullable user_data; /* Pointer to av call handler */
|
||||
|
||||
struct MSICall *next;
|
||||
struct MSICall *prev;
|
||||
struct MSICall *_Nullable next;
|
||||
struct MSICall *_Nullable prev;
|
||||
} MSICall;
|
||||
|
||||
/**
|
||||
@@ -84,14 +85,14 @@ typedef struct MSICall {
|
||||
* returned the call is considered errored and will be handled
|
||||
* as such which means it will be terminated without any notice.
|
||||
*/
|
||||
typedef int msi_action_cb(void *object, MSICall *call);
|
||||
typedef int msi_action_cb(void *_Nullable object, MSICall *_Nonnull call);
|
||||
|
||||
/**
|
||||
* Send packet callback.
|
||||
*
|
||||
* @return 0 on success, -1 on failure.
|
||||
*/
|
||||
typedef int msi_send_packet_cb(void *user_data, uint32_t friend_number, const uint8_t *data, size_t length);
|
||||
typedef int msi_send_packet_cb(void *_Nullable user_data, uint32_t friend_number, const uint8_t *_Nonnull data, size_t length);
|
||||
|
||||
/**
|
||||
* MSI callbacks.
|
||||
@@ -110,14 +111,14 @@ typedef struct MSICallbacks {
|
||||
*/
|
||||
typedef struct MSISession {
|
||||
/* Call handlers */
|
||||
MSICall **calls;
|
||||
uint32_t calls_tail;
|
||||
uint32_t calls_head;
|
||||
MSICall *_Nullable *_Nullable calls;
|
||||
uint32_t calls_tail;
|
||||
uint32_t calls_head;
|
||||
|
||||
void *user_data;
|
||||
void *_Nullable user_data;
|
||||
|
||||
msi_send_packet_cb *send_packet;
|
||||
void *send_packet_user_data;
|
||||
msi_send_packet_cb *_Nonnull send_packet;
|
||||
void *_Nullable send_packet_user_data;
|
||||
|
||||
pthread_mutex_t mutex[1];
|
||||
|
||||
|
||||
Reference in New Issue
Block a user