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:
@@ -17,25 +17,25 @@
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
typedef void *mem_malloc_cb(void *obj, uint32_t size);
|
||||
typedef void *mem_calloc_cb(void *obj, uint32_t nmemb, uint32_t size);
|
||||
typedef void *mem_realloc_cb(void *obj, void *ptr, uint32_t size);
|
||||
typedef void mem_free_cb(void *obj, void *ptr);
|
||||
typedef void *mem_malloc_cb(void *_Nullable obj, uint32_t size);
|
||||
typedef void *mem_calloc_cb(void *_Nullable obj, uint32_t nmemb, uint32_t size);
|
||||
typedef void *mem_realloc_cb(void *_Nullable obj, void *_Nullable ptr, uint32_t size);
|
||||
typedef void mem_free_cb(void *_Nullable obj, void *_Nullable ptr);
|
||||
|
||||
/** @brief Functions wrapping standard C memory allocation functions. */
|
||||
typedef struct Memory_Funcs {
|
||||
mem_malloc_cb *malloc;
|
||||
mem_calloc_cb *calloc;
|
||||
mem_realloc_cb *realloc;
|
||||
mem_free_cb *free;
|
||||
mem_malloc_cb *_Nullable malloc;
|
||||
mem_calloc_cb *_Nullable calloc;
|
||||
mem_realloc_cb *_Nullable realloc;
|
||||
mem_free_cb *_Nullable free;
|
||||
} Memory_Funcs;
|
||||
|
||||
typedef struct Memory {
|
||||
const Memory_Funcs *funcs;
|
||||
void *obj;
|
||||
const Memory_Funcs *_Nullable funcs;
|
||||
void *_Nullable obj;
|
||||
} Memory;
|
||||
|
||||
const Memory *os_memory(void);
|
||||
const Memory *_Nullable os_memory(void);
|
||||
|
||||
/**
|
||||
* @brief Allocate an array of a given size for built-in types.
|
||||
@@ -43,7 +43,7 @@ const Memory *os_memory(void);
|
||||
* The array will not be initialised. Supported built-in types are
|
||||
* `uint8_t`, `int8_t`, and `int16_t`.
|
||||
*/
|
||||
non_null() void *mem_balloc(const Memory *mem, uint32_t size);
|
||||
void *_Nullable mem_balloc(const Memory *_Nonnull mem, uint32_t size);
|
||||
|
||||
/**
|
||||
* @brief Resize an array of a given size for built-in types.
|
||||
@@ -51,21 +51,21 @@ non_null() void *mem_balloc(const Memory *mem, uint32_t size);
|
||||
* If used for a type other than byte-sized types, `size` needs to be manually
|
||||
* multiplied by the element size.
|
||||
*/
|
||||
non_null(1) nullable(2) void *mem_brealloc(const Memory *mem, void *ptr, uint32_t size);
|
||||
void *_Nullable mem_brealloc(const Memory *_Nonnull mem, void *_Nullable ptr, uint32_t size);
|
||||
|
||||
/**
|
||||
* @brief Allocate a single object.
|
||||
*
|
||||
* Always use as `(T *)mem_alloc(mem, sizeof(T))`.
|
||||
*/
|
||||
non_null() void *mem_alloc(const Memory *mem, uint32_t size);
|
||||
void *_Nullable mem_alloc(const Memory *_Nonnull mem, uint32_t size);
|
||||
|
||||
/**
|
||||
* @brief Allocate a vector (array) of objects.
|
||||
*
|
||||
* Always use as `(T *)mem_valloc(mem, N, sizeof(T))`.
|
||||
*/
|
||||
non_null() void *mem_valloc(const Memory *mem, uint32_t nmemb, uint32_t size);
|
||||
void *_Nullable mem_valloc(const Memory *_Nonnull mem, uint32_t nmemb, uint32_t size);
|
||||
|
||||
/**
|
||||
* @brief Resize an object vector.
|
||||
@@ -82,10 +82,10 @@ non_null() void *mem_valloc(const Memory *mem, uint32_t nmemb, uint32_t size);
|
||||
* case where the multiplication would overflow. If such an overflow occurs,
|
||||
* `mem_vrealloc()` returns `nullptr`.
|
||||
*/
|
||||
non_null(1) nullable(2) void *mem_vrealloc(const Memory *mem, void *ptr, uint32_t nmemb, uint32_t size);
|
||||
void *_Nullable mem_vrealloc(const Memory *_Nonnull mem, void *_Nullable ptr, uint32_t nmemb, uint32_t size);
|
||||
|
||||
/** @brief Free an array, object, or object vector. */
|
||||
non_null(1) nullable(2) void mem_delete(const Memory *mem, void *ptr);
|
||||
void mem_delete(const Memory *_Nonnull mem, void *_Nullable ptr);
|
||||
|
||||
#ifdef __cplusplus
|
||||
} /* extern "C" */
|
||||
|
Reference in New Issue
Block a user