diff options
| author | Martin Storsjö <martin@martin.st> | 2020-04-11 11:46:17 +0300 |
|---|---|---|
| committer | Martin Storsjö <martin@martin.st> | 2020-05-10 08:51:42 +0300 |
| commit | 5f4e28fe77a77682ac52841308582e74d09ca6e7 (patch) | |
| tree | 0e64aea3337df912f8409c8cd16e82cd5b6a4418 /src | |
| parent | 1c88bce602842999e2afda43dea55db3069ad470 (diff) | |
itx: Add a bpc parameter to the itx dsp init function
Diffstat (limited to 'src')
| -rw-r--r-- | src/arm/itx_init_tmpl.c | 2 | ||||
| -rw-r--r-- | src/decode.c | 2 | ||||
| -rw-r--r-- | src/itx.h | 4 | ||||
| -rw-r--r-- | src/itx_tmpl.c | 4 |
4 files changed, 6 insertions, 6 deletions
diff --git a/src/arm/itx_init_tmpl.c b/src/arm/itx_init_tmpl.c index f9c68e9..8fa7a61 100644 --- a/src/arm/itx_init_tmpl.c +++ b/src/arm/itx_init_tmpl.c @@ -77,7 +77,7 @@ decl_itx_fn(dav1d_inv_txfm_add_dct_dct_64x16_neon); decl_itx_fn(dav1d_inv_txfm_add_dct_dct_64x32_neon); decl_itx_fn(dav1d_inv_txfm_add_dct_dct_64x64_neon); -COLD void bitfn(dav1d_itx_dsp_init_arm)(Dav1dInvTxfmDSPContext *const c) { +COLD void bitfn(dav1d_itx_dsp_init_arm)(Dav1dInvTxfmDSPContext *const c, int bpc) { #define assign_itx_fn(pfx, w, h, type, type_enum, ext) \ c->itxfm_add[pfx##TX_##w##X##h][type_enum] = \ dav1d_inv_txfm_add_##type##_##w##x##h##_##ext diff --git a/src/decode.c b/src/decode.c index a5646c6..f678215 100644 --- a/src/decode.c +++ b/src/decode.c @@ -3302,7 +3302,7 @@ int dav1d_submit_frame(Dav1dContext *const c) { #define assign_bitdepth_case(bd) \ dav1d_cdef_dsp_init_##bd##bpc(&dsp->cdef); \ dav1d_intra_pred_dsp_init_##bd##bpc(&dsp->ipred); \ - dav1d_itx_dsp_init_##bd##bpc(&dsp->itx); \ + dav1d_itx_dsp_init_##bd##bpc(&dsp->itx, bpc); \ dav1d_loop_filter_dsp_init_##bd##bpc(&dsp->lf); \ dav1d_loop_restoration_dsp_init_##bd##bpc(&dsp->lr, bpc); \ dav1d_mc_dsp_init_##bd##bpc(&dsp->mc); \ @@ -43,8 +43,8 @@ typedef struct Dav1dInvTxfmDSPContext { itxfm_fn itxfm_add[N_RECT_TX_SIZES][N_TX_TYPES_PLUS_LL]; } Dav1dInvTxfmDSPContext; -bitfn_decls(void dav1d_itx_dsp_init, Dav1dInvTxfmDSPContext *c); -bitfn_decls(void dav1d_itx_dsp_init_arm, Dav1dInvTxfmDSPContext *c); +bitfn_decls(void dav1d_itx_dsp_init, Dav1dInvTxfmDSPContext *c, int bpc); +bitfn_decls(void dav1d_itx_dsp_init_arm, Dav1dInvTxfmDSPContext *c, int bpc); bitfn_decls(void dav1d_itx_dsp_init_x86, Dav1dInvTxfmDSPContext *c); #endif /* DAV1D_SRC_ITX_H */ diff --git a/src/itx_tmpl.c b/src/itx_tmpl.c index 02f34e8..dcd9f68 100644 --- a/src/itx_tmpl.c +++ b/src/itx_tmpl.c @@ -180,7 +180,7 @@ static void inv_txfm_add_wht_wht_4x4_c(pixel *dst, const ptrdiff_t stride, dst[x] = iclip_pixel(dst[x] + *c++); } -COLD void bitfn(dav1d_itx_dsp_init)(Dav1dInvTxfmDSPContext *const c) { +COLD void bitfn(dav1d_itx_dsp_init)(Dav1dInvTxfmDSPContext *const c, int bpc) { #define assign_itx_all_fn64(w, h, pfx) \ c->itxfm_add[pfx##TX_##w##X##h][DCT_DCT ] = \ inv_txfm_add_dct_dct_##w##x##h##_c @@ -249,7 +249,7 @@ COLD void bitfn(dav1d_itx_dsp_init)(Dav1dInvTxfmDSPContext *const c) { #if HAVE_ASM #if ARCH_AARCH64 || ARCH_ARM - bitfn(dav1d_itx_dsp_init_arm)(c); + bitfn(dav1d_itx_dsp_init_arm)(c, bpc); #endif #if ARCH_X86 bitfn(dav1d_itx_dsp_init_x86)(c); |