[FFmpeg-devel] [PATCH 4/7] avcodec: use new constants in assembly
James Darnley
james.darnley at gmail.com
Fri Oct 2 19:08:31 CEST 2015
---
libavcodec/x86/ac3dsp.asm | 2 +-
libavcodec/x86/bswapdsp.asm | 3 +--
libavcodec/x86/diracdsp_yasm.asm | 6 +-----
libavcodec/x86/dwt_yasm.asm | 6 +-----
libavcodec/x86/h263_loopfilter.asm | 2 +-
libavcodec/x86/h264_chromamc.asm | 6 +-----
libavcodec/x86/h264_chromamc_10bit.asm | 8 +-------
libavcodec/x86/h264_deblock.asm | 5 +----
libavcodec/x86/h264_deblock_10bit.asm | 5 +----
libavcodec/x86/h264_idct.asm | 4 +---
libavcodec/x86/h264_idct_10bit.asm | 2 +-
libavcodec/x86/h264_intrapred.asm | 10 +---------
libavcodec/x86/h264_intrapred_10bit.asm | 8 +-------
libavcodec/x86/h264_qpel_10bit.asm | 5 +----
libavcodec/x86/h264_qpel_8bit.asm | 7 +------
libavcodec/x86/h264_weight_10bit.asm | 3 +--
libavcodec/x86/hevc_deblock.asm | 7 +------
libavcodec/x86/hevc_mc.asm | 10 +---------
libavcodec/x86/hevc_res_add.asm | 2 +-
libavcodec/x86/hevc_sao.asm | 3 +--
libavcodec/x86/hevc_sao_10bit.asm | 4 +---
libavcodec/x86/hpeldsp.asm | 4 +---
libavcodec/x86/huffyuvdsp.asm | 2 +-
libavcodec/x86/idctdsp.asm | 5 +----
libavcodec/x86/me_cmp.asm | 6 +-----
libavcodec/x86/mpegvideoencdsp.asm | 5 +----
libavcodec/x86/pngdsp.asm | 5 +----
libavcodec/x86/proresdsp.asm | 6 +-----
libavcodec/x86/qpeldsp.asm | 9 +--------
libavcodec/x86/rv40dsp.asm | 6 +-----
libavcodec/x86/v210enc.asm | 4 +---
libavcodec/x86/vc1dsp.asm | 4 +---
libavcodec/x86/vp3dsp.asm | 8 +-------
libavcodec/x86/vp6dsp.asm | 3 +--
libavcodec/x86/vp8dsp.asm | 6 +-----
libavcodec/x86/vp8dsp_loopfilter.asm | 8 +-------
libavcodec/x86/vp9intrapred.asm | 17 +----------------
libavcodec/x86/vp9itxfm.asm | 9 +--------
libavcodec/x86/vp9lpf.asm | 7 +------
libavcodec/x86/vp9mc.asm | 4 +---
libavcodec/x86/vp9mc_16bpp.asm | 3 +--
41 files changed, 41 insertions(+), 188 deletions(-)
diff --git a/libavcodec/x86/ac3dsp.asm b/libavcodec/x86/ac3dsp.asm
index 675ade3..167070f 100644
--- a/libavcodec/x86/ac3dsp.asm
+++ b/libavcodec/x86/ac3dsp.asm
@@ -20,6 +20,7 @@
;******************************************************************************
%include "libavutil/x86/x86util.asm"
+%include "libavutil/x86/constants.inc"
SECTION_RODATA
@@ -32,7 +33,6 @@ pw_bap_mul1: dw 21846, 21846, 0, 32768, 21846, 21846, 0, 32768
pw_bap_mul2: dw 5, 7, 0, 7, 5, 7, 0, 7
; used in ff_ac3_extract_exponents()
-cextern pd_1
pd_151: times 4 dd 151
; used in ff_apply_window_int16()
diff --git a/libavcodec/x86/bswapdsp.asm b/libavcodec/x86/bswapdsp.asm
index 56d8083..fc5e04d 100644
--- a/libavcodec/x86/bswapdsp.asm
+++ b/libavcodec/x86/bswapdsp.asm
@@ -22,12 +22,11 @@
;******************************************************************************
%include "libavutil/x86/x86util.asm"
+%include "libavutil/x86/constants.inc"
SECTION_RODATA
pb_bswap32: db 3, 2, 1, 0, 7, 6, 5, 4, 11, 10, 9, 8, 15, 14, 13, 12
-cextern pb_80
-
SECTION .text
; %1 = aligned/unaligned
diff --git a/libavcodec/x86/diracdsp_yasm.asm b/libavcodec/x86/diracdsp_yasm.asm
index 40fe2c8..d763809 100644
--- a/libavcodec/x86/diracdsp_yasm.asm
+++ b/libavcodec/x86/diracdsp_yasm.asm
@@ -19,15 +19,11 @@
;******************************************************************************
%include "libavutil/x86/x86util.asm"
+%include "libavutil/x86/constants.inc"
SECTION_RODATA
pw_7: times 8 dw 7
-cextern pw_3
-cextern pw_16
-cextern pw_32
-cextern pb_80
-
section .text
%macro UNPACK_ADD 6
diff --git a/libavcodec/x86/dwt_yasm.asm b/libavcodec/x86/dwt_yasm.asm
index 658acc1..9b31a1c 100644
--- a/libavcodec/x86/dwt_yasm.asm
+++ b/libavcodec/x86/dwt_yasm.asm
@@ -20,15 +20,11 @@
;******************************************************************************
%include "libavutil/x86/x86util.asm"
+%include "libavutil/x86/constants.inc"
SECTION_RODATA
pw_1991: times 4 dw 9,-1
-cextern pw_1
-cextern pw_2
-cextern pw_8
-cextern pw_16
-
section .text
; %1 -= (%2 + %3 + 2)>>2 %4 is pw_2
diff --git a/libavcodec/x86/h263_loopfilter.asm b/libavcodec/x86/h263_loopfilter.asm
index 77c8cf1..acee44f 100644
--- a/libavcodec/x86/h263_loopfilter.asm
+++ b/libavcodec/x86/h263_loopfilter.asm
@@ -21,9 +21,9 @@
;******************************************************************************
%include "libavutil/x86/x86util.asm"
+%include "libavutil/x86/constants.inc"
SECTION_RODATA
-cextern pb_FC
cextern h263_loop_filter_strength
SECTION .text
diff --git a/libavcodec/x86/h264_chromamc.asm b/libavcodec/x86/h264_chromamc.asm
index 107ae51..57864e8 100644
--- a/libavcodec/x86/h264_chromamc.asm
+++ b/libavcodec/x86/h264_chromamc.asm
@@ -21,6 +21,7 @@
;******************************************************************************
%include "libavutil/x86/x86util.asm"
+%include "libavutil/x86/constants.inc"
SECTION_RODATA
@@ -57,12 +58,7 @@ rnd_rv40_1d_tbl: times 4 dw 0
times 4 dw 4
times 4 dw 3
-cextern pw_3
-cextern pw_4
-cextern pw_8
pw_28: times 8 dw 28
-cextern pw_32
-cextern pw_64
SECTION .text
diff --git a/libavcodec/x86/h264_chromamc_10bit.asm b/libavcodec/x86/h264_chromamc_10bit.asm
index c358482..3487fc3 100644
--- a/libavcodec/x86/h264_chromamc_10bit.asm
+++ b/libavcodec/x86/h264_chromamc_10bit.asm
@@ -23,13 +23,7 @@
;******************************************************************************
%include "libavutil/x86/x86util.asm"
-
-SECTION_RODATA
-
-cextern pw_4
-cextern pw_8
-cextern pw_32
-cextern pw_64
+%include "libavutil/x86/constants.inc"
SECTION .text
diff --git a/libavcodec/x86/h264_deblock.asm b/libavcodec/x86/h264_deblock.asm
index 5151f3c..e5fa004 100644
--- a/libavcodec/x86/h264_deblock.asm
+++ b/libavcodec/x86/h264_deblock.asm
@@ -25,6 +25,7 @@
;******************************************************************************
%include "libavutil/x86/x86util.asm"
+%include "libavutil/x86/constants.inc"
SECTION_RODATA
@@ -33,10 +34,6 @@ pb_3_1: times 4 db 3, 1
SECTION .text
-cextern pb_0
-cextern pb_1
-cextern pb_3
-
; expands to [base],...,[base+7*stride]
%define PASS8ROWS(base, base3, stride, stride3) \
[base], [base+stride], [base+stride*2], [base3], \
diff --git a/libavcodec/x86/h264_deblock_10bit.asm b/libavcodec/x86/h264_deblock_10bit.asm
index ebf8a3f..e3dc65b 100644
--- a/libavcodec/x86/h264_deblock_10bit.asm
+++ b/libavcodec/x86/h264_deblock_10bit.asm
@@ -25,13 +25,10 @@
;******************************************************************************
%include "libavutil/x86/x86util.asm"
+%include "libavutil/x86/constants.inc"
SECTION .text
-cextern pw_2
-cextern pw_3
-cextern pw_4
-cextern pw_1023
%define pw_pixel_max pw_1023
; out: %4 = |%1-%2|-%3
diff --git a/libavcodec/x86/h264_idct.asm b/libavcodec/x86/h264_idct.asm
index 7fafe19..b9fc5fc 100644
--- a/libavcodec/x86/h264_idct.asm
+++ b/libavcodec/x86/h264_idct.asm
@@ -27,6 +27,7 @@
;*****************************************************************************
%include "libavutil/x86/x86util.asm"
+%include "libavutil/x86/constants.inc"
SECTION_RODATA
@@ -50,9 +51,6 @@ scan8_mem: db 4+ 1*8, 5+ 1*8, 4+ 2*8, 5+ 2*8
%define scan8 scan8_mem
%endif
-cextern pw_32
-cextern pw_1
-
SECTION .text
; %1=uint8_t *dst, %2=int16_t *block, %3=int stride
diff --git a/libavcodec/x86/h264_idct_10bit.asm b/libavcodec/x86/h264_idct_10bit.asm
index cc115b0..4a951fc 100644
--- a/libavcodec/x86/h264_idct_10bit.asm
+++ b/libavcodec/x86/h264_idct_10bit.asm
@@ -23,6 +23,7 @@
;******************************************************************************
%include "libavutil/x86/x86util.asm"
+%include "libavutil/x86/constants.inc"
SECTION_RODATA
@@ -30,7 +31,6 @@ pd_32: times 4 dd 32
SECTION .text
-cextern pw_1023
%define pw_pixel_max pw_1023
;-----------------------------------------------------------------------------
diff --git a/libavcodec/x86/h264_intrapred.asm b/libavcodec/x86/h264_intrapred.asm
index c88d91b..d490695 100644
--- a/libavcodec/x86/h264_intrapred.asm
+++ b/libavcodec/x86/h264_intrapred.asm
@@ -23,6 +23,7 @@
;******************************************************************************
%include "libavutil/x86/x86util.asm"
+%include "libavutil/x86/constants.inc"
SECTION_RODATA
@@ -39,15 +40,6 @@ pw_m4to4: dw -4, -3, -2, -1, 1, 2, 3, 4
SECTION .text
-cextern pb_1
-cextern pb_3
-cextern pw_4
-cextern pw_5
-cextern pw_8
-cextern pw_16
-cextern pw_17
-cextern pw_32
-
;-----------------------------------------------------------------------------
; void ff_pred16x16_vertical_8(uint8_t *src, int stride)
;-----------------------------------------------------------------------------
diff --git a/libavcodec/x86/h264_intrapred_10bit.asm b/libavcodec/x86/h264_intrapred_10bit.asm
index 9aeb702..deab312 100644
--- a/libavcodec/x86/h264_intrapred_10bit.asm
+++ b/libavcodec/x86/h264_intrapred_10bit.asm
@@ -23,17 +23,11 @@
;******************************************************************************
%include "libavutil/x86/x86util.asm"
+%include "libavutil/x86/constants.inc"
SECTION_RODATA
-cextern pw_1023
%define pw_pixel_max pw_1023
-cextern pw_512
-cextern pw_16
-cextern pw_8
-cextern pw_4
-cextern pw_2
-cextern pw_1
pw_m32101234: dw -3, -2, -1, 0, 1, 2, 3, 4
pw_m3: times 8 dw -3
diff --git a/libavcodec/x86/h264_qpel_10bit.asm b/libavcodec/x86/h264_qpel_10bit.asm
index 7e9be36..e7de10d 100644
--- a/libavcodec/x86/h264_qpel_10bit.asm
+++ b/libavcodec/x86/h264_qpel_10bit.asm
@@ -23,14 +23,11 @@
;******************************************************************************
%include "libavutil/x86/x86util.asm"
+%include "libavutil/x86/constants.inc"
SECTION_RODATA 32
-cextern pw_1023
%define pw_pixel_max pw_1023
-cextern pw_16
-cextern pw_1
-cextern pb_0
pad10: times 8 dw 10*1023
pad20: times 8 dw 20*1023
diff --git a/libavcodec/x86/h264_qpel_8bit.asm b/libavcodec/x86/h264_qpel_8bit.asm
index 2d287ba..36b35cb 100644
--- a/libavcodec/x86/h264_qpel_8bit.asm
+++ b/libavcodec/x86/h264_qpel_8bit.asm
@@ -24,12 +24,7 @@
;******************************************************************************
%include "libavutil/x86/x86util.asm"
-
-SECTION_RODATA 32
-
-cextern pw_16
-cextern pw_5
-cextern pb_0
+%include "libavutil/x86/constants.inc"
SECTION .text
diff --git a/libavcodec/x86/h264_weight_10bit.asm b/libavcodec/x86/h264_weight_10bit.asm
index f924e55..e572e14 100644
--- a/libavcodec/x86/h264_weight_10bit.asm
+++ b/libavcodec/x86/h264_weight_10bit.asm
@@ -23,14 +23,13 @@
;******************************************************************************
%include "libavutil/x86/x86util.asm"
+%include "libavutil/x86/constants.inc"
SECTION_RODATA 32
sq_1: dq 1
dq 0
-cextern pw_1
-cextern pw_1023
%define pw_pixel_max pw_1023
SECTION .text
diff --git a/libavcodec/x86/hevc_deblock.asm b/libavcodec/x86/hevc_deblock.asm
index 48a5975..376b1ec 100644
--- a/libavcodec/x86/hevc_deblock.asm
+++ b/libavcodec/x86/hevc_deblock.asm
@@ -23,18 +23,13 @@
;******************************************************************************
%include "libavutil/x86/x86util.asm"
+%include "libavutil/x86/constants.inc"
SECTION_RODATA
-cextern pw_1023
%define pw_pixel_max_10 pw_1023
pw_pixel_max_12: times 8 dw ((1 << 12)-1)
pw_m2: times 8 dw -2
-pd_1 : times 4 dd 1
-
-cextern pw_4
-cextern pw_8
-cextern pw_m1
SECTION .text
INIT_XMM sse2
diff --git a/libavcodec/x86/hevc_mc.asm b/libavcodec/x86/hevc_mc.asm
index ff6ed07..1545fe7 100644
--- a/libavcodec/x86/hevc_mc.asm
+++ b/libavcodec/x86/hevc_mc.asm
@@ -19,15 +19,9 @@
; * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
; */
%include "libavutil/x86/x86util.asm"
+%include "libavutil/x86/constants.inc"
SECTION_RODATA 32
-cextern pw_255
-cextern pw_512
-cextern pw_2048
-cextern pw_8192
-cextern pw_1023
-cextern pw_1024
-cextern pw_4096
%define pw_8 pw_512
%define pw_10 pw_2048
%define pw_12 pw_8192
@@ -37,8 +31,6 @@ cextern pw_4096
%define max_pixels_10 pw_1023
pw_bi_8: times 16 dw (1 << 8)
max_pixels_12: times 16 dw ((1 << 12)-1)
-cextern pd_1
-cextern pb_0
%macro EPEL_TABLE 4
hevc_epel_filters_%4_%1 times %2 d%3 -2, 58
diff --git a/libavcodec/x86/hevc_res_add.asm b/libavcodec/x86/hevc_res_add.asm
index dc3e88a..5df65c7 100644
--- a/libavcodec/x86/hevc_res_add.asm
+++ b/libavcodec/x86/hevc_res_add.asm
@@ -19,10 +19,10 @@
; * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
; */
%include "libavutil/x86/x86util.asm"
+%include "libavutil/x86/constants.inc"
SECTION .text
-cextern pw_1023
%define max_pixels_10 pw_1023
diff --git a/libavcodec/x86/hevc_sao.asm b/libavcodec/x86/hevc_sao.asm
index 888a28a..6488d31 100644
--- a/libavcodec/x86/hevc_sao.asm
+++ b/libavcodec/x86/hevc_sao.asm
@@ -22,13 +22,12 @@
;******************************************************************************
%include "libavutil/x86/x86util.asm"
+%include "libavutil/x86/constants.inc"
SECTION_RODATA 32
pb_edge_shuffle: times 2 db 1, 2, 0, 3, 4, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1
pb_eo: db -1, 0, 1, 0, 0, -1, 0, 1, -1, -1, 1, 1, 1, -1, -1, 1
-cextern pb_1
-cextern pb_2
SECTION .text
diff --git a/libavcodec/x86/hevc_sao_10bit.asm b/libavcodec/x86/hevc_sao_10bit.asm
index f45fc56..4410cb4 100644
--- a/libavcodec/x86/hevc_sao_10bit.asm
+++ b/libavcodec/x86/hevc_sao_10bit.asm
@@ -22,6 +22,7 @@
;******************************************************************************
%include "libavutil/x86/x86util.asm"
+%include "libavutil/x86/constants.inc"
SECTION_RODATA 32
@@ -29,9 +30,6 @@ pw_m2: times 16 dw -2
pw_mask10: times 16 dw 0x03FF
pw_mask12: times 16 dw 0x0FFF
pb_eo: db -1, 0, 1, 0, 0, -1, 0, 1, -1, -1, 1, 1, 1, -1, -1, 1
-cextern pw_m1
-cextern pw_1
-cextern pw_2
SECTION .text
diff --git a/libavcodec/x86/hpeldsp.asm b/libavcodec/x86/hpeldsp.asm
index 82fb893..2441664 100644
--- a/libavcodec/x86/hpeldsp.asm
+++ b/libavcodec/x86/hpeldsp.asm
@@ -26,14 +26,12 @@
;******************************************************************************
%include "libavutil/x86/x86util.asm"
+%include "libavutil/x86/constants.inc"
SECTION_RODATA
-cextern pb_1
-cextern pw_2
pb_interleave16: db 0, 8, 1, 9, 2, 10, 3, 11, 4, 12, 5, 13, 6, 14, 7, 15
pb_interleave8: db 0, 4, 1, 5, 2, 6, 3, 7
-cextern pw_8192
SECTION .text
diff --git a/libavcodec/x86/huffyuvdsp.asm b/libavcodec/x86/huffyuvdsp.asm
index 0dbe598..f7b8e38 100644
--- a/libavcodec/x86/huffyuvdsp.asm
+++ b/libavcodec/x86/huffyuvdsp.asm
@@ -21,9 +21,9 @@
;******************************************************************************
%include "libavutil/x86/x86util.asm"
+%include "libavutil/x86/constants.inc"
SECTION_RODATA
-cextern pb_15
pb_zzzzzzzz77777777: times 8 db -1
pb_7: times 8 db 7
pb_zzzz3333zzzzbbbb: db -1,-1,-1,-1,3,3,3,3,-1,-1,-1,-1,11,11,11,11
diff --git a/libavcodec/x86/idctdsp.asm b/libavcodec/x86/idctdsp.asm
index 089425a..ecadeee 100644
--- a/libavcodec/x86/idctdsp.asm
+++ b/libavcodec/x86/idctdsp.asm
@@ -22,10 +22,7 @@
;******************************************************************************
%include "libavutil/x86/x86util.asm"
-
-SECTION_RODATA
-
-cextern pb_80
+%include "libavutil/x86/constants.inc"
SECTION .text
diff --git a/libavcodec/x86/me_cmp.asm b/libavcodec/x86/me_cmp.asm
index ad06d48..e2de64e 100644
--- a/libavcodec/x86/me_cmp.asm
+++ b/libavcodec/x86/me_cmp.asm
@@ -22,11 +22,7 @@
;*****************************************************************************
%include "libavutil/x86/x86util.asm"
-
-SECTION_RODATA
-
-cextern pb_1
-cextern pb_80
+%include "libavutil/x86/constants.inc"
SECTION .text
diff --git a/libavcodec/x86/mpegvideoencdsp.asm b/libavcodec/x86/mpegvideoencdsp.asm
index aec73f8..e5d55fb 100644
--- a/libavcodec/x86/mpegvideoencdsp.asm
+++ b/libavcodec/x86/mpegvideoencdsp.asm
@@ -22,10 +22,7 @@
;*****************************************************************************
%include "libavutil/x86/x86util.asm"
-
-SECTION_RODATA
-
-cextern pw_1
+%include "libavutil/x86/constants.inc"
SECTION .text
; int ff_pix_sum16_mmx(uint8_t *pix, int line_size)
diff --git a/libavcodec/x86/pngdsp.asm b/libavcodec/x86/pngdsp.asm
index 50e4255..4c94d45 100644
--- a/libavcodec/x86/pngdsp.asm
+++ b/libavcodec/x86/pngdsp.asm
@@ -22,10 +22,7 @@
;******************************************************************************
%include "libavutil/x86/x86util.asm"
-
-SECTION_RODATA
-
-cextern pw_255
+%include "libavutil/x86/constants.inc"
SECTION .text
diff --git a/libavcodec/x86/proresdsp.asm b/libavcodec/x86/proresdsp.asm
index 632ece6..02372d5 100644
--- a/libavcodec/x86/proresdsp.asm
+++ b/libavcodec/x86/proresdsp.asm
@@ -23,6 +23,7 @@
;******************************************************************************
%include "libavutil/x86/x86util.asm"
+%include "libavutil/x86/constants.inc"
%define W1sh2 22725 ; W1 = 90901 = 22725<<2 + 1
%define W2sh2 21407 ; W2 = 85627 = 21407<<2 - 1
@@ -50,11 +51,6 @@ w5_plus_w7: times 4 dw W5sh2, +W7sh2
w7_min_w5: times 4 dw W7sh2, -W5sh2
pw_88: times 8 dw 0x2008
-cextern pw_1
-cextern pw_4
-cextern pw_512
-cextern pw_1019
-
section .text align=16
; interleave data while maintaining source
diff --git a/libavcodec/x86/qpeldsp.asm b/libavcodec/x86/qpeldsp.asm
index 282faed..1af1d62 100644
--- a/libavcodec/x86/qpeldsp.asm
+++ b/libavcodec/x86/qpeldsp.asm
@@ -22,14 +22,7 @@
;******************************************************************************
%include "libavutil/x86/x86util.asm"
-
-SECTION_RODATA
-cextern pb_1
-cextern pw_3
-cextern pw_15
-cextern pw_16
-cextern pw_20
-
+%include "libavutil/x86/constants.inc"
SECTION .text
diff --git a/libavcodec/x86/rv40dsp.asm b/libavcodec/x86/rv40dsp.asm
index fdd81a0..5800087 100644
--- a/libavcodec/x86/rv40dsp.asm
+++ b/libavcodec/x86/rv40dsp.asm
@@ -22,11 +22,11 @@
;******************************************************************************
%include "libavutil/x86/x86util.asm"
+%include "libavutil/x86/constants.inc"
SECTION_RODATA
align 16
-pw_1024: times 8 dw 1 << (16 - 6) ; pw_1024
sixtap_filter_hb_m: times 8 db 1, -5
times 8 db 52, 20
@@ -68,10 +68,6 @@ filter_h6_shuf1: db 0, 1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6, 7, 7, 8
filter_h6_shuf2: db 2, 3, 3, 4, 4, 5, 5, 6, 6, 7, 7, 8, 8, 9, 9, 10
filter_h6_shuf3: db 5, 4, 6, 5, 7, 6, 8, 7, 9, 8, 10, 9, 11, 10, 12, 11
-cextern pw_32
-cextern pw_16
-cextern pw_512
-
SECTION .text
;-----------------------------------------------------------------------------
diff --git a/libavcodec/x86/v210enc.asm b/libavcodec/x86/v210enc.asm
index 859e2d9..cd95a12 100644
--- a/libavcodec/x86/v210enc.asm
+++ b/libavcodec/x86/v210enc.asm
@@ -20,10 +20,10 @@
;******************************************************************************
%include "libavutil/x86/x86util.asm"
+%include "libavutil/x86/constants.inc"
SECTION_RODATA
-cextern pw_4
%define v210_enc_min_10 pw_4
v210_enc_max_10: times 8 dw 0x3fb
@@ -33,9 +33,7 @@ v210_enc_luma_shuf_10: db -1,0,1,-1,2,3,4,5,-1,6,7,-1,8,9,10,11
v210_enc_chroma_mult_10: dw 1,4,16,0,16,1,4,0
v210_enc_chroma_shuf_10: db 0,1,8,9,-1,2,3,-1,10,11,4,5,-1,12,13,-1
-cextern pb_1
%define v210_enc_min_8 pb_1
-cextern pb_FE
%define v210_enc_max_8 pb_FE
v210_enc_luma_shuf_8: db 6,-1,7,-1,8,-1,9,-1,10,-1,11,-1,-1,-1,-1,-1
diff --git a/libavcodec/x86/vc1dsp.asm b/libavcodec/x86/vc1dsp.asm
index 546688c..57cdd6c 100644
--- a/libavcodec/x86/vc1dsp.asm
+++ b/libavcodec/x86/vc1dsp.asm
@@ -20,9 +20,7 @@
;******************************************************************************
%include "libavutil/x86/x86util.asm"
-
-cextern pw_4
-cextern pw_5
+%include "libavutil/x86/constants.inc"
section .text
diff --git a/libavcodec/x86/vp3dsp.asm b/libavcodec/x86/vp3dsp.asm
index d457cd7..616da4d 100644
--- a/libavcodec/x86/vp3dsp.asm
+++ b/libavcodec/x86/vp3dsp.asm
@@ -20,6 +20,7 @@
;******************************************************************************
%include "libavutil/x86/x86util.asm"
+%include "libavutil/x86/constants.inc"
; MMX-optimized functions cribbed from the original VP3 source code.
@@ -37,13 +38,6 @@ pb_7: times 8 db 0x07
pb_1F: times 8 db 0x1f
pb_81: times 8 db 0x81
-cextern pb_1
-cextern pb_3
-cextern pb_80
-cextern pb_FE
-
-cextern pw_8
-
SECTION .text
; this is off by one or two for some cases when filter_limit is greater than 63
diff --git a/libavcodec/x86/vp6dsp.asm b/libavcodec/x86/vp6dsp.asm
index 3d874ea..8605a93 100644
--- a/libavcodec/x86/vp6dsp.asm
+++ b/libavcodec/x86/vp6dsp.asm
@@ -21,8 +21,7 @@
;******************************************************************************
%include "libavutil/x86/x86util.asm"
-
-cextern pw_64
+%include "libavutil/x86/constants.inc"
SECTION .text
diff --git a/libavcodec/x86/vp8dsp.asm b/libavcodec/x86/vp8dsp.asm
index 538b3f4..1daea4c 100644
--- a/libavcodec/x86/vp8dsp.asm
+++ b/libavcodec/x86/vp8dsp.asm
@@ -21,6 +21,7 @@
;******************************************************************************
%include "libavutil/x86/x86util.asm"
+%include "libavutil/x86/constants.inc"
SECTION_RODATA
@@ -146,11 +147,6 @@ filter_h6_shuf3: db 3, 4, 4, 5, 5, 6, 6, 7, 7, 8, 8, 9, 9, 10, 10, 11
pw_20091: times 4 dw 20091
pw_17734: times 4 dw 17734
-cextern pw_3
-cextern pw_4
-cextern pw_64
-cextern pw_256
-
SECTION .text
;-------------------------------------------------------------------------------
diff --git a/libavcodec/x86/vp8dsp_loopfilter.asm b/libavcodec/x86/vp8dsp_loopfilter.asm
index 98bb669..6db3a0d 100644
--- a/libavcodec/x86/vp8dsp_loopfilter.asm
+++ b/libavcodec/x86/vp8dsp_loopfilter.asm
@@ -21,6 +21,7 @@
;******************************************************************************
%include "libavutil/x86/x86util.asm"
+%include "libavutil/x86/constants.inc"
SECTION_RODATA
@@ -29,17 +30,10 @@ pw_63: times 8 dw 63
pb_4: times 16 db 4
pb_F8: times 16 db 0xF8
-pb_FE: times 16 db 0xFE
pb_27_63: times 8 db 27, 63
pb_18_63: times 8 db 18, 63
pb_9_63: times 8 db 9, 63
-cextern pb_1
-cextern pb_3
-cextern pw_9
-cextern pw_18
-cextern pb_80
-
SECTION .text
;-----------------------------------------------------------------------------
diff --git a/libavcodec/x86/vp9intrapred.asm b/libavcodec/x86/vp9intrapred.asm
index 31f7d44..e71077e 100644
--- a/libavcodec/x86/vp9intrapred.asm
+++ b/libavcodec/x86/vp9intrapred.asm
@@ -28,12 +28,12 @@
;******************************************************************************
%include "libavutil/x86/x86util.asm"
+%include "libavutil/x86/constants.inc"
SECTION_RODATA 32
pw_m256: times 16 dw -256
pw_m255: times 16 dw -255
-pw_4096: times 8 dw 4096
pb_4x3_4x2_4x1_4x0: times 4 db 3
times 4 db 2
@@ -73,21 +73,6 @@ pb_6xm1_2x0: times 6 db -1
pb_6x0_2xm1: times 6 db 0
times 2 db -1
-cextern pb_1
-cextern pb_2
-cextern pb_3
-cextern pb_15
-cextern pw_2
-cextern pw_4
-cextern pw_8
-cextern pw_16
-cextern pw_32
-cextern pw_255
-cextern pw_512
-cextern pw_1024
-cextern pw_2048
-cextern pw_8192
-
SECTION .text
; dc_NxN(uint8_t *dst, ptrdiff_t stride, const uint8_t *l, const uint8_t *a)
diff --git a/libavcodec/x86/vp9itxfm.asm b/libavcodec/x86/vp9itxfm.asm
index 4d6a73c..eaa0dc9 100644
--- a/libavcodec/x86/vp9itxfm.asm
+++ b/libavcodec/x86/vp9itxfm.asm
@@ -22,6 +22,7 @@
;******************************************************************************
%include "libavutil/x86/x86util.asm"
+%include "libavutil/x86/constants.inc"
SECTION_RODATA
@@ -72,14 +73,6 @@ pw_13377_0: times 4 dw 13377, 0
pd_8192: times 4 dd 8192
-cextern pw_8
-cextern pw_16
-cextern pw_32
-cextern pw_512
-cextern pw_1024
-cextern pw_2048
-cextern pw_m1
-
SECTION .text
; (a*x + b*y + round) >> shift
diff --git a/libavcodec/x86/vp9lpf.asm b/libavcodec/x86/vp9lpf.asm
index 2c4fe21..4845023 100644
--- a/libavcodec/x86/vp9lpf.asm
+++ b/libavcodec/x86/vp9lpf.asm
@@ -22,12 +22,10 @@
;******************************************************************************
%include "libavutil/x86/x86util.asm"
+%include "libavutil/x86/constants.inc"
SECTION_RODATA
-cextern pb_3
-cextern pb_80
-
pb_4: times 16 db 0x04
pb_10: times 16 db 0x10
pb_40: times 16 db 0x40
@@ -36,9 +34,6 @@ pb_f8: times 16 db 0xf8
pb_fe: times 16 db 0xfe
pb_ff: times 16 db 0xff
-cextern pw_4
-cextern pw_8
-
; with mix functions, two 8-bit thresholds are stored in a 16-bit storage,
; the following mask is used to splat both in the same register
mask_mix: times 8 db 0
diff --git a/libavcodec/x86/vp9mc.asm b/libavcodec/x86/vp9mc.asm
index 9152ba5..a451fcb 100644
--- a/libavcodec/x86/vp9mc.asm
+++ b/libavcodec/x86/vp9mc.asm
@@ -21,12 +21,10 @@
;******************************************************************************
%include "libavutil/x86/x86util.asm"
+%include "libavutil/x86/constants.inc"
SECTION_RODATA 32
-cextern pw_256
-cextern pw_64
-
%macro F8_SSSE3_TAPS 8
times 16 db %1, %2
times 16 db %3, %4
diff --git a/libavcodec/x86/vp9mc_16bpp.asm b/libavcodec/x86/vp9mc_16bpp.asm
index f60dab7..be5ab7b 100644
--- a/libavcodec/x86/vp9mc_16bpp.asm
+++ b/libavcodec/x86/vp9mc_16bpp.asm
@@ -21,14 +21,13 @@
;******************************************************************************
%include "libavutil/x86/x86util.asm"
+%include "libavutil/x86/constants.inc"
SECTION_RODATA 32
pw_4095: times 16 dw 0xfff
pd_64: times 8 dd 64
-cextern pw_1023
-
SECTION .text
%macro filter_h4_fn 1-2 12
--
2.5.3
More information about the ffmpeg-devel
mailing list