diff --git a/build/arm-msvs/obj_int_extract.bat b/build/arm-msvs/obj_int_extract.bat index 879261662..7fd16a303 100644 --- a/build/arm-msvs/obj_int_extract.bat +++ b/build/arm-msvs/obj_int_extract.bat @@ -7,11 +7,7 @@ REM in the file PATENTS. All contributing project authors may REM be found in the AUTHORS file in the root of the source tree. echo on -cl /I "./" /I "%1" /nologo /c /DWINAPI_FAMILY=WINAPI_FAMILY_PHONE_APP "%1/vp8/common/vp8_asm_com_offsets.c" -cl /I "./" /I "%1" /nologo /c /DWINAPI_FAMILY=WINAPI_FAMILY_PHONE_APP "%1/vp8/decoder/vp8_asm_dec_offsets.c" cl /I "./" /I "%1" /nologo /c /DWINAPI_FAMILY=WINAPI_FAMILY_PHONE_APP "%1/vp8/encoder/vp8_asm_enc_offsets.c" -obj_int_extract.exe rvds "vp8_asm_com_offsets.obj" > "vp8_asm_com_offsets.asm" -obj_int_extract.exe rvds "vp8_asm_dec_offsets.obj" > "vp8_asm_dec_offsets.asm" obj_int_extract.exe rvds "vp8_asm_enc_offsets.obj" > "vp8_asm_enc_offsets.asm" cl /I "./" /I "%1" /nologo /c /DWINAPI_FAMILY=WINAPI_FAMILY_PHONE_APP "%1/vpx_scale/vpx_scale_asm_offsets.c" diff --git a/build/x86-msvs/obj_int_extract.bat b/build/x86-msvs/obj_int_extract.bat index 2a362b885..4e9b0ecd0 100644 --- a/build/x86-msvs/obj_int_extract.bat +++ b/build/x86-msvs/obj_int_extract.bat @@ -7,10 +7,6 @@ REM in the file PATENTS. All contributing project authors may REM be found in the AUTHORS file in the root of the source tree. echo on -cl /I "./" /I "%1" /nologo /c "%1/vp8/common/vp8_asm_com_offsets.c" -cl /I "./" /I "%1" /nologo /c "%1/vp8/decoder/vp8_asm_dec_offsets.c" cl /I "./" /I "%1" /nologo /c "%1/vp8/encoder/vp8_asm_enc_offsets.c" -obj_int_extract.exe rvds "vp8_asm_com_offsets.obj" > "vp8_asm_com_offsets.asm" -obj_int_extract.exe rvds "vp8_asm_dec_offsets.obj" > "vp8_asm_dec_offsets.asm" obj_int_extract.exe rvds "vp8_asm_enc_offsets.obj" > "vp8_asm_enc_offsets.asm" diff --git a/vp8/common/vp8_asm_com_offsets.c b/vp8/common/vp8_asm_com_offsets.c deleted file mode 100644 index 7bab90f82..000000000 --- a/vp8/common/vp8_asm_com_offsets.c +++ /dev/null @@ -1,52 +0,0 @@ -/* - * Copyright (c) 2011 The WebM project authors. All Rights Reserved. - * - * Use of this source code is governed by a BSD-style license - * that can be found in the LICENSE file in the root of the source - * tree. An additional intellectual property rights grant can be found - * in the file PATENTS. All contributing project authors may - * be found in the AUTHORS file in the root of the source tree. - */ - - -#include "vpx_config.h" -#include "vpx/vpx_codec.h" -#include "vpx_ports/asm_offsets.h" -#include "vp8/common/blockd.h" - -#if CONFIG_POSTPROC -#include "postproc.h" -#endif /* CONFIG_POSTPROC */ - -BEGIN - -#if CONFIG_POSTPROC -/* mfqe.c / filter_by_weight */ -DEFINE(MFQE_PRECISION_VAL, MFQE_PRECISION); -#endif /* CONFIG_POSTPROC */ - -END - -/* add asserts for any offset that is not supported by assembly code */ -/* add asserts for any size that is not supported by assembly code */ - -#if HAVE_MEDIA -/* switch case in vp8_intra4x4_predict_armv6 is based on these enumerated values */ -ct_assert(B_DC_PRED, B_DC_PRED == 0); -ct_assert(B_TM_PRED, B_TM_PRED == 1); -ct_assert(B_VE_PRED, B_VE_PRED == 2); -ct_assert(B_HE_PRED, B_HE_PRED == 3); -ct_assert(B_LD_PRED, B_LD_PRED == 4); -ct_assert(B_RD_PRED, B_RD_PRED == 5); -ct_assert(B_VR_PRED, B_VR_PRED == 6); -ct_assert(B_VL_PRED, B_VL_PRED == 7); -ct_assert(B_HD_PRED, B_HD_PRED == 8); -ct_assert(B_HU_PRED, B_HU_PRED == 9); -#endif - -#if HAVE_SSE2 -#if CONFIG_POSTPROC -/* vp8_filter_by_weight16x16 and 8x8 */ -ct_assert(MFQE_PRECISION_VAL, MFQE_PRECISION == 4) -#endif /* CONFIG_POSTPROC */ -#endif /* HAVE_SSE2 */ diff --git a/vp8/decoder/vp8_asm_dec_offsets.c b/vp8/decoder/vp8_asm_dec_offsets.c deleted file mode 100644 index 842a0d574..000000000 --- a/vp8/decoder/vp8_asm_dec_offsets.c +++ /dev/null @@ -1,26 +0,0 @@ -/* - * Copyright (c) 2011 The WebM project authors. All Rights Reserved. - * - * Use of this source code is governed by a BSD-style license - * that can be found in the LICENSE file in the root of the source - * tree. An additional intellectual property rights grant can be found - * in the file PATENTS. All contributing project authors may - * be found in the AUTHORS file in the root of the source tree. - */ - - -#include "vpx_ports/asm_offsets.h" -#include "onyxd_int.h" - -BEGIN - -DEFINE(bool_decoder_user_buffer_end, offsetof(BOOL_DECODER, user_buffer_end)); -DEFINE(bool_decoder_user_buffer, offsetof(BOOL_DECODER, user_buffer)); -DEFINE(bool_decoder_value, offsetof(BOOL_DECODER, value)); -DEFINE(bool_decoder_count, offsetof(BOOL_DECODER, count)); -DEFINE(bool_decoder_range, offsetof(BOOL_DECODER, range)); - -END - -/* add asserts for any offset that is not supported by assembly code */ -/* add asserts for any size that is not supported by assembly code */ diff --git a/vp8/vp8_common.mk b/vp8/vp8_common.mk index cde2651b5..f98eb318d 100644 --- a/vp8/vp8_common.mk +++ b/vp8/vp8_common.mk @@ -66,7 +66,6 @@ VP8_COMMON_SRCS-yes += common/setupintrarecon.c VP8_COMMON_SRCS-yes += common/swapyv12buffer.c VP8_COMMON_SRCS-yes += common/variance_c.c VP8_COMMON_SRCS-yes += common/variance.h -VP8_COMMON_SRCS-yes += common/vp8_asm_com_offsets.c VP8_COMMON_SRCS-yes += common/vp8_entropymodedata.h @@ -192,7 +191,4 @@ VP8_COMMON_SRCS-$(HAVE_NEON) += common/arm/neon/vp8_subpixelvariance8x8_neon$(A VP8_COMMON_SRCS-$(HAVE_NEON) += common/arm/neon/vp8_subpixelvariance16x16_neon$(ASM) VP8_COMMON_SRCS-$(HAVE_NEON) += common/arm/neon/vp8_subpixelvariance16x16s_neon$(ASM) -$(eval $(call asm_offsets_template,\ - vp8_asm_com_offsets.asm, $(VP8_PREFIX)common/vp8_asm_com_offsets.c)) - $(eval $(call rtcd_h_template,vp8_rtcd,vp8/common/rtcd_defs.sh)) diff --git a/vp8/vp8dx.mk b/vp8/vp8dx.mk index c26f42d58..4a8f46708 100644 --- a/vp8/vp8dx.mk +++ b/vp8/vp8dx.mk @@ -35,9 +35,5 @@ VP8_DX_SRCS-yes += decoder/onyxd_int.h VP8_DX_SRCS-yes += decoder/treereader.h VP8_DX_SRCS-yes += decoder/onyxd_if.c VP8_DX_SRCS-$(CONFIG_MULTITHREAD) += decoder/threading.c -VP8_DX_SRCS-yes += decoder/vp8_asm_dec_offsets.c VP8_DX_SRCS-yes := $(filter-out $(VP8_DX_SRCS_REMOVE-yes),$(VP8_DX_SRCS-yes)) - -$(eval $(call asm_offsets_template,\ - vp8_asm_dec_offsets.asm, $(VP8_PREFIX)decoder/vp8_asm_dec_offsets.c))