diff options
| author | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2022-07-23 01:28:48 +0200 |
|---|---|---|
| committer | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2022-07-28 03:49:54 +0200 |
| commit | 7ab9b30800c0847133fa23fc86d05029d0415fe2 (patch) | |
| tree | 70c2b6edaed07416dc897d0c8ab6d07ba2f6c2fb /libavcodec/arm | |
| parent | 80ad06ab1b33bfea25be618a64742d90468b36e6 (diff) | |
| download | ffmpeg-7ab9b30800c0847133fa23fc86d05029d0415fe2.tar.gz | |
avcodec/vp56: Move VP5-9 range coder functions to a header of their own
Also use a vpx prefix for them.
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
Diffstat (limited to 'libavcodec/arm')
| -rw-r--r-- | libavcodec/arm/vp8.h | 4 | ||||
| -rw-r--r-- | libavcodec/arm/vp8_armv6.S | 2 | ||||
| -rw-r--r-- | libavcodec/arm/vpx_arith.h (renamed from libavcodec/arm/vp56_arith.h) | 18 |
3 files changed, 12 insertions, 12 deletions
diff --git a/libavcodec/arm/vp8.h b/libavcodec/arm/vp8.h index 965342d93b..7c59a7d63d 100644 --- a/libavcodec/arm/vp8.h +++ b/libavcodec/arm/vp8.h @@ -22,12 +22,12 @@ #include <stdint.h> #include "config.h" -#include "libavcodec/vp56.h" +#include "libavcodec/vpx_rac.h" #include "libavcodec/vp8.h" #if HAVE_ARMV6_EXTERNAL #define vp8_decode_block_coeffs_internal ff_decode_block_coeffs_armv6 -int ff_decode_block_coeffs_armv6(VP56RangeCoder *rc, int16_t block[16], +int ff_decode_block_coeffs_armv6(VPXRangeCoder *rc, int16_t block[16], uint8_t probs[8][3][NUM_DCT_TOKENS-1], int i, uint8_t *token_prob, int16_t qmul[2]); #endif diff --git a/libavcodec/arm/vp8_armv6.S b/libavcodec/arm/vp8_armv6.S index e7d25a45c1..7ecf2641fb 100644 --- a/libavcodec/arm/vp8_armv6.S +++ b/libavcodec/arm/vp8_armv6.S @@ -65,7 +65,7 @@ T orrcs \cw, \cw, \t1 function ff_decode_block_coeffs_armv6, export=1 push {r0,r1,r4-r11,lr} - movrelx lr, X(ff_vp56_norm_shift) + movrelx lr, X(ff_vpx_norm_shift) ldrd r4, r5, [sp, #44] @ token_prob, qmul cmp r3, #0 ldr r11, [r5] diff --git a/libavcodec/arm/vp56_arith.h b/libavcodec/arm/vpx_arith.h index feb1247916..1ead2284c3 100644 --- a/libavcodec/arm/vp56_arith.h +++ b/libavcodec/arm/vpx_arith.h @@ -18,8 +18,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef AVCODEC_ARM_VP56_ARITH_H -#define AVCODEC_ARM_VP56_ARITH_H +#ifndef AVCODEC_ARM_VPX_ARITH_H +#define AVCODEC_ARM_VPX_ARITH_H #if CONFIG_THUMB # define A(x) @@ -39,10 +39,10 @@ #if HAVE_ARMV6_INLINE -#define vp56_rac_get_prob vp56_rac_get_prob_armv6 -static inline int vp56_rac_get_prob_armv6(VP56RangeCoder *c, int pr) +#define vpx_rac_get_prob vp56_rac_get_prob_armv6 +static inline int vp56_rac_get_prob_armv6(VPXRangeCoder *c, int pr) { - unsigned shift = ff_vp56_norm_shift[c->high]; + unsigned shift = ff_vpx_norm_shift[c->high]; unsigned code_word = c->code_word << shift; unsigned high = c->high << shift; unsigned bit; @@ -76,10 +76,10 @@ static inline int vp56_rac_get_prob_armv6(VP56RangeCoder *c, int pr) return bit; } -#define vp56_rac_get_prob_branchy vp56_rac_get_prob_branchy_armv6 -static inline int vp56_rac_get_prob_branchy_armv6(VP56RangeCoder *c, int pr) +#define vpx_rac_get_prob_branchy vp56_rac_get_prob_branchy_armv6 +static inline int vp56_rac_get_prob_branchy_armv6(VPXRangeCoder *c, int pr) { - unsigned shift = ff_vp56_norm_shift[c->high]; + unsigned shift = ff_vpx_norm_shift[c->high]; unsigned code_word = c->code_word << shift; unsigned high = c->high << shift; unsigned low; @@ -118,4 +118,4 @@ static inline int vp56_rac_get_prob_branchy_armv6(VP56RangeCoder *c, int pr) #endif -#endif /* AVCODEC_ARM_VP56_ARITH_H */ +#endif /* AVCODEC_ARM_VPX_ARITH_H */ |