Skip to content

Commit 174df76

Browse files
authored
Misc fixes to build dav1d C sources cleanly (#1454)
2 parents f699aef + 073b4f1 commit 174df76

File tree

3 files changed

+35
-4
lines changed

3 files changed

+35
-4
lines changed

src/mc.h

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,37 @@ void (name)(pixel *dst, ptrdiff_t dst_stride, \
113113
int dst_w, int h, int src_w, int dx, int mx HIGHBD_DECL_SUFFIX)
114114
typedef decl_resize_fn(*resize_fn);
115115

116+
#define decl_8tap_gen(decl_name, fn_name, opt) \
117+
decl_##decl_name##_fn(BF(dav1d_##fn_name##_8tap_regular, opt)); \
118+
decl_##decl_name##_fn(BF(dav1d_##fn_name##_8tap_regular_smooth, opt)); \
119+
decl_##decl_name##_fn(BF(dav1d_##fn_name##_8tap_regular_sharp, opt)); \
120+
decl_##decl_name##_fn(BF(dav1d_##fn_name##_8tap_smooth_regular, opt)); \
121+
decl_##decl_name##_fn(BF(dav1d_##fn_name##_8tap_smooth, opt)); \
122+
decl_##decl_name##_fn(BF(dav1d_##fn_name##_8tap_smooth_sharp, opt)); \
123+
decl_##decl_name##_fn(BF(dav1d_##fn_name##_8tap_sharp_regular, opt)); \
124+
decl_##decl_name##_fn(BF(dav1d_##fn_name##_8tap_sharp_smooth, opt)); \
125+
decl_##decl_name##_fn(BF(dav1d_##fn_name##_8tap_sharp, opt))
126+
127+
#define decl_8tap_fns(opt) \
128+
decl_8tap_gen(mc, put, opt); \
129+
decl_8tap_gen(mct, prep, opt)
130+
131+
#define init_8tap_gen(name, opt) \
132+
init_##name##_fn(FILTER_2D_8TAP_REGULAR, 8tap_regular, opt); \
133+
init_##name##_fn(FILTER_2D_8TAP_REGULAR_SMOOTH, 8tap_regular_smooth, opt); \
134+
init_##name##_fn(FILTER_2D_8TAP_REGULAR_SHARP, 8tap_regular_sharp, opt); \
135+
init_##name##_fn(FILTER_2D_8TAP_SMOOTH_REGULAR, 8tap_smooth_regular, opt); \
136+
init_##name##_fn(FILTER_2D_8TAP_SMOOTH, 8tap_smooth, opt); \
137+
init_##name##_fn(FILTER_2D_8TAP_SMOOTH_SHARP, 8tap_smooth_sharp, opt); \
138+
init_##name##_fn(FILTER_2D_8TAP_SHARP_REGULAR, 8tap_sharp_regular, opt); \
139+
init_##name##_fn(FILTER_2D_8TAP_SHARP_SMOOTH, 8tap_sharp_smooth, opt); \
140+
init_##name##_fn(FILTER_2D_8TAP_SHARP, 8tap_sharp, opt)
141+
142+
#define init_8tap_fns(opt) \
143+
init_8tap_gen(mc, opt); \
144+
init_8tap_gen(mct, opt)
145+
146+
116147
typedef struct Dav1dMCDSPContext {
117148
mc_fn mc[N_2D_FILTERS];
118149
mc_scaled_fn mc_scaled[N_2D_FILTERS];

src/refmvs.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -826,7 +826,7 @@ int dav1d_refmvs_init_frame(refmvs_frame *const rf,
826826
/* Note that sizeof(*rf->r) == 12, but it's accessed using 16-byte unaligned
827827
* loads in save_tmvs() asm which can overread 4 bytes into rp_proj. */
828828
dav1d_free_aligned(rf->r);
829-
rf->r = dav1d_alloc_aligned(ALLOC_REFMVS, r_sz + rp_proj_sz, 64);
829+
rf->r = dav1d_alloc_aligned(r_sz + rp_proj_sz, 64);
830830
if (!rf->r) {
831831
rf->n_blocks = 0;
832832
return DAV1D_ERR(ENOMEM);

tests/checkasm/checkasm.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,9 @@
4747
#define checkasm_load_context() longjmp(checkasm_context_buf, 1)
4848
#endif
4949

50-
#include "include/common/attributes.h"
51-
#include "include/common/bitdepth.h"
52-
#include "include/common/intops.h"
50+
#include "src/include/common/attributes.h"
51+
#include "src/include/common/bitdepth.h"
52+
#include "src/include/common/intops.h"
5353

5454
int xor128_rand(void);
5555
#define rnd xor128_rand

0 commit comments

Comments
 (0)