Squashed 'external/toxcore/c-toxcore/' changes from 1701691d5..640e6cace
640e6cace fix(toxav): remove extra copy of video frame on encode Tested and works, but there might be alignment issues and other stuff. 6f7f51554 chore(toxav): use realtime deadline for vp8 encoder Technically all this does is choose a quality based on frame duration, which we always set to 1, and as such is always realtime. (In same timebase as pts, which we use as a frame counter...) 5047ae5a2 chore: make the source tarball exhibit the old behavior 14804a4b8 chore: Fix sonar-scan CI action. e2db7d946 cleanup: Exclude lan_discovery test from running on macos, instead of excluding it from the project. 3accade67 chore: Fix CI, disabling some tests that no longer run on CI. ef8d767e6 cleanup: Fix comment formatting errors. 34ec822da cleanup: Fix some clang-19 format warnings. 40b3f0b46 refactor: Use clang's nullability qualifiers instead of attributes. f81e30679 refactor: Use per-parameter nullability annotations. REVERT: 1701691d5 chore(toxav): use realtime deadline for vp8 encoder Technically all this does is choose a quality based on frame duration, which we always set to 1, and as such is always realtime. (In same timebase as pts, which we use as a frame counter...) REVERT: a87505867 fix(toxav): remove extra copy of video frame on encode Tested and works, but there might be alignment issues and other stuff. git-subtree-dir: external/toxcore/c-toxcore git-subtree-split: 640e6cace81b4412c45977b94eb9c41e53c54035
This commit is contained in:
@@ -15,15 +15,13 @@
|
||||
|
||||
typedef struct TCP_Priority_List TCP_Priority_List;
|
||||
struct TCP_Priority_List {
|
||||
TCP_Priority_List *next;
|
||||
TCP_Priority_List *_Nullable next;
|
||||
uint16_t size;
|
||||
uint16_t sent;
|
||||
uint8_t *data;
|
||||
uint8_t *_Nonnull data;
|
||||
};
|
||||
|
||||
non_null(1) nullable(2)
|
||||
void wipe_priority_list(const Memory *mem, TCP_Priority_List *p);
|
||||
|
||||
void wipe_priority_list(const Memory *_Nonnull mem, TCP_Priority_List *_Nullable p);
|
||||
#define NUM_RESERVED_PORTS 16
|
||||
#define NUM_CLIENT_CONNECTIONS (256 - NUM_RESERVED_PORTS)
|
||||
|
||||
@@ -54,9 +52,9 @@ typedef enum Tcp_Packet {
|
||||
#define MAX_PACKET_SIZE 2048
|
||||
|
||||
typedef struct TCP_Connection {
|
||||
const Memory *mem;
|
||||
const Random *rng;
|
||||
const Network *ns;
|
||||
const Memory *_Nonnull mem;
|
||||
const Random *_Nonnull rng;
|
||||
const Network *_Nonnull ns;
|
||||
Socket sock;
|
||||
IP_Port ip_port; // for debugging.
|
||||
uint8_t sent_nonce[CRYPTO_NONCE_SIZE]; /* Nonce of sent packets. */
|
||||
@@ -65,57 +63,47 @@ typedef struct TCP_Connection {
|
||||
uint16_t last_packet_length;
|
||||
uint16_t last_packet_sent;
|
||||
|
||||
TCP_Priority_List *priority_queue_start;
|
||||
TCP_Priority_List *priority_queue_end;
|
||||
TCP_Priority_List *_Nullable priority_queue_start;
|
||||
TCP_Priority_List *_Nullable priority_queue_end;
|
||||
|
||||
// This is a shared pointer to the parent's respective Net_Profile object
|
||||
// (either TCP_Server for TCP server packets or TCP_Connections for TCP client packets).
|
||||
Net_Profile *net_profile;
|
||||
Net_Profile *_Nullable net_profile;
|
||||
} TCP_Connection;
|
||||
|
||||
/**
|
||||
* @retval 0 if pending data was sent completely
|
||||
* @retval -1 if it wasn't
|
||||
*/
|
||||
non_null()
|
||||
int send_pending_data_nonpriority(const Logger *logger, TCP_Connection *con);
|
||||
int send_pending_data_nonpriority(const Logger *_Nonnull logger, TCP_Connection *_Nonnull con);
|
||||
|
||||
/**
|
||||
* @retval 0 if pending data was sent completely
|
||||
* @retval -1 if it wasn't
|
||||
*/
|
||||
non_null()
|
||||
int send_pending_data(const Logger *logger, TCP_Connection *con);
|
||||
int send_pending_data(const Logger *_Nonnull logger, TCP_Connection *_Nonnull con);
|
||||
|
||||
/**
|
||||
* @retval 1 on success.
|
||||
* @retval 0 if could not send packet.
|
||||
* @retval -1 on failure (connection must be killed).
|
||||
*/
|
||||
non_null()
|
||||
int write_packet_tcp_secure_connection(
|
||||
const Logger *logger, TCP_Connection *con, const uint8_t *data, uint16_t length,
|
||||
bool priority);
|
||||
int write_packet_tcp_secure_connection(const Logger *_Nonnull logger, TCP_Connection *_Nonnull con, const uint8_t *_Nonnull data, uint16_t length, bool priority);
|
||||
|
||||
/** @brief Read length bytes from socket.
|
||||
*
|
||||
* return length on success
|
||||
* return -1 on failure/no data in buffer.
|
||||
*/
|
||||
non_null()
|
||||
int read_tcp_packet(
|
||||
const Logger *logger, const Memory *mem, const Network *ns, Socket sock, uint8_t *data, uint16_t length, const IP_Port *ip_port);
|
||||
int read_tcp_packet(const Logger *_Nonnull logger, const Memory *_Nonnull mem, const Network *_Nonnull ns, Socket sock, uint8_t *_Nonnull data, uint16_t length,
|
||||
const IP_Port *_Nonnull ip_port);
|
||||
|
||||
/**
|
||||
* @return length of received packet on success.
|
||||
* @retval 0 if could not read any packet.
|
||||
* @retval -1 on failure (connection must be killed).
|
||||
*/
|
||||
non_null()
|
||||
int read_packet_tcp_secure_connection(
|
||||
const Logger *logger, const Memory *mem, const Network *ns,
|
||||
Socket sock, uint16_t *next_packet_length,
|
||||
const uint8_t *shared_key, uint8_t *recv_nonce, uint8_t *data,
|
||||
uint16_t max_len, const IP_Port *ip_port);
|
||||
int read_packet_tcp_secure_connection(const Logger *_Nonnull logger, const Memory *_Nonnull mem, const Network *_Nonnull ns, Socket sock, uint16_t *_Nonnull next_packet_length,
|
||||
const uint8_t *_Nonnull shared_key, uint8_t *_Nonnull recv_nonce, uint8_t *_Nonnull data, uint16_t max_len, const IP_Port *_Nonnull ip_port);
|
||||
|
||||
#endif /* C_TOXCORE_TOXCORE_TCP_COMMON_H */
|
||||
|
Reference in New Issue
Block a user