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:
@@ -25,13 +25,8 @@
|
||||
*/
|
||||
#define SMALL_ARRAY_THRESHOLD 16
|
||||
|
||||
non_null()
|
||||
static void merge_sort_merge_back(
|
||||
void *arr,
|
||||
const void *l_arr, uint32_t l_arr_size,
|
||||
const void *r_arr, uint32_t r_arr_size,
|
||||
uint32_t left_start,
|
||||
const void *object, const Sort_Funcs *funcs)
|
||||
static void merge_sort_merge_back(void *_Nonnull arr, const void *_Nonnull l_arr, uint32_t l_arr_size, const void *_Nonnull r_arr, uint32_t r_arr_size, uint32_t left_start,
|
||||
const void *_Nonnull object, const Sort_Funcs *_Nonnull funcs)
|
||||
{
|
||||
uint32_t li = 0;
|
||||
uint32_t ri = 0;
|
||||
@@ -67,10 +62,7 @@ static void merge_sort_merge_back(
|
||||
}
|
||||
|
||||
/** Function to merge the two haves `arr[left_start..mid]` and `arr[mid+1..right_end]` of array `arr[]`. */
|
||||
non_null()
|
||||
static void merge_sort_merge(
|
||||
void *arr, uint32_t left_start, uint32_t mid, uint32_t right_end, void *tmp,
|
||||
const void *object, const Sort_Funcs *funcs)
|
||||
static void merge_sort_merge(void *_Nonnull arr, uint32_t left_start, uint32_t mid, uint32_t right_end, void *_Nonnull tmp, const void *_Nonnull object, const Sort_Funcs *_Nonnull funcs)
|
||||
{
|
||||
const uint32_t l_arr_size = mid - left_start + 1;
|
||||
const uint32_t r_arr_size = right_end - mid;
|
||||
@@ -96,8 +88,7 @@ static void merge_sort_merge(
|
||||
merge_sort_merge_back(arr, l_arr, l_arr_size, r_arr, r_arr_size, left_start, object, funcs);
|
||||
}
|
||||
|
||||
non_null()
|
||||
static void insertion_sort_step(void *arr, void *tmp, uint32_t i, const void *object, const Sort_Funcs *funcs)
|
||||
static void insertion_sort_step(void *_Nonnull arr, void *_Nonnull tmp, uint32_t i, const void *_Nonnull object, const Sort_Funcs *_Nonnull funcs)
|
||||
{
|
||||
funcs->set_callback(tmp, 0, funcs->get_callback(arr, i));
|
||||
uint32_t j = i;
|
||||
@@ -113,16 +104,14 @@ static void insertion_sort_step(void *arr, void *tmp, uint32_t i, const void *ob
|
||||
funcs->set_callback(arr, j, tmp);
|
||||
}
|
||||
|
||||
non_null()
|
||||
static void insertion_sort_with_buf(void *arr, uint32_t arr_size, void *tmp, uint32_t tmp_size, const void *object, const Sort_Funcs *funcs)
|
||||
static void insertion_sort_with_buf(void *_Nonnull arr, uint32_t arr_size, void *_Nonnull tmp, uint32_t tmp_size, const void *_Nonnull object, const Sort_Funcs *_Nonnull funcs)
|
||||
{
|
||||
for (uint32_t i = 1; i < arr_size; ++i) {
|
||||
insertion_sort_step(arr, tmp, i, object, funcs);
|
||||
}
|
||||
}
|
||||
|
||||
non_null()
|
||||
static bool insertion_sort(void *arr, uint32_t arr_size, const void *object, const Sort_Funcs *funcs)
|
||||
static bool insertion_sort(void *_Nonnull arr, uint32_t arr_size, const void *_Nonnull object, const Sort_Funcs *_Nonnull funcs)
|
||||
{
|
||||
void *tmp = funcs->alloc_callback(object, 1);
|
||||
|
||||
|
Reference in New Issue
Block a user