From 8aae24608967afeb2355c2ca3898b0254a39da1d Mon Sep 17 00:00:00 2001 From: John Koleszar Date: Thu, 12 Jan 2012 16:55:44 -0800 Subject: [PATCH] RTCD: finalize removal of old RTCD system This is the final commit in the series converting to the new RTCD system. It removes the encoder csystemdependent files and the remaining global function pointers that didn't conform to the old RTCD system. Change-Id: I9649706f1bb89f0cbf431ab0e3e7552d37be4d8e --- vp8/common/rtcd_defs.sh | 7 +++ vp8/encoder/arm/arm_csystemdependent.c | 42 ------------------ vp8/encoder/generic/csystemdependent.c | 38 ---------------- vp8/encoder/onyx_if.c | 2 - vp8/encoder/picklpf.c | 13 +++--- ...csystemdependent.c => vp8_enc_stubs_mmx.c} | 43 +------------------ vp8/encoder/x86/vp8_enc_stubs_sse2.c | 43 +++++++++++++++++++ vp8/vp8cx.mk | 4 +- vp8/vp8cx_arm.mk | 2 - vpx_scale/yv12config.h | 2 +- 10 files changed, 60 insertions(+), 136 deletions(-) delete mode 100644 vp8/encoder/arm/arm_csystemdependent.c delete mode 100644 vp8/encoder/generic/csystemdependent.c rename vp8/encoder/x86/{x86_csystemdependent.c => vp8_enc_stubs_mmx.c} (71%) create mode 100644 vp8/encoder/x86/vp8_enc_stubs_sse2.c diff --git a/vp8/common/rtcd_defs.sh b/vp8/common/rtcd_defs.sh index 13fe8ecdd..90e2d2854 100644 --- a/vp8/common/rtcd_defs.sh +++ b/vp8/common/rtcd_defs.sh @@ -9,6 +9,7 @@ struct block; struct macroblock; struct variance_vtable; union int_mv; +struct yv12_buffer_config; EOF } forward_decls common_forward_decls @@ -489,5 +490,11 @@ if [ "$CONFIG_REALTIME_ONLY" != "yes" ]; then specialize vp8_temporal_filter_apply sse2 fi +# +# Pick Loopfilter +# +prototype void vp8_yv12_copy_partial_frame "struct yv12_buffer_config *src_ybc, struct yv12_buffer_config *dst_ybc" +specialize vp8_yv12_copy_partial_frame neon + # End of encoder only functions fi diff --git a/vp8/encoder/arm/arm_csystemdependent.c b/vp8/encoder/arm/arm_csystemdependent.c deleted file mode 100644 index 963b9fd08..000000000 --- a/vp8/encoder/arm/arm_csystemdependent.c +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Copyright (c) 2010 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_ports/arm.h" -#include "vp8/encoder/variance.h" -#include "vp8/encoder/onyx_int.h" - -extern void (*vp8_yv12_copy_partial_frame_ptr)(YV12_BUFFER_CONFIG *src_ybc, YV12_BUFFER_CONFIG *dst_ybc); -extern void vp8_yv12_copy_partial_frame(YV12_BUFFER_CONFIG *src_ybc, YV12_BUFFER_CONFIG *dst_ybc); -extern void vp8_yv12_copy_partial_frame_neon(YV12_BUFFER_CONFIG *src_ybc, YV12_BUFFER_CONFIG *dst_ybc); - -void vp8_arch_arm_encoder_init(VP8_COMP *cpi) -{ -#if CONFIG_RUNTIME_CPU_DETECT - int flags = cpi->common.cpu_caps; - -#if HAVE_EDSP - if (flags & HAS_EDSP) - { - } -#endif - -#endif /* CONFIG_RUNTIME_CPU_DETECT */ - -#if HAVE_NEON -#if CONFIG_RUNTIME_CPU_DETECT - if (flags & HAS_NEON) -#endif - { - vp8_yv12_copy_partial_frame_ptr = vp8_yv12_copy_partial_frame_neon; - } -#endif -} diff --git a/vp8/encoder/generic/csystemdependent.c b/vp8/encoder/generic/csystemdependent.c deleted file mode 100644 index 673a8050d..000000000 --- a/vp8/encoder/generic/csystemdependent.c +++ /dev/null @@ -1,38 +0,0 @@ -/* - * Copyright (c) 2010 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 "vp8/encoder/variance.h" -#include "vp8/encoder/onyx_int.h" - - -void vp8_arch_x86_encoder_init(VP8_COMP *cpi); -void vp8_arch_arm_encoder_init(VP8_COMP *cpi); - -void (*vp8_yv12_copy_partial_frame_ptr)(YV12_BUFFER_CONFIG *src_ybc, - YV12_BUFFER_CONFIG *dst_ybc); -extern void vp8_yv12_copy_partial_frame(YV12_BUFFER_CONFIG *src_ybc, - YV12_BUFFER_CONFIG *dst_ybc); - -void vp8_cmachine_specific_config(VP8_COMP *cpi) -{ - // Pure C: - vp8_yv12_copy_partial_frame_ptr = vp8_yv12_copy_partial_frame; - -#if ARCH_X86 || ARCH_X86_64 - vp8_arch_x86_encoder_init(cpi); -#endif - -#if ARCH_ARM - vp8_arch_arm_encoder_init(cpi); -#endif - -} diff --git a/vp8/encoder/onyx_if.c b/vp8/encoder/onyx_if.c index b03b33953..4b41bbd94 100644 --- a/vp8/encoder/onyx_if.c +++ b/vp8/encoder/onyx_if.c @@ -46,7 +46,6 @@ extern void vp8cx_pick_filter_level_fast(YV12_BUFFER_CONFIG *sd, VP8_COMP *cpi); extern void vp8cx_set_alt_lf_level(VP8_COMP *cpi, int filt_val); extern void vp8cx_pick_filter_level(YV12_BUFFER_CONFIG *sd, VP8_COMP *cpi); -extern void vp8_cmachine_specific_config(VP8_COMP *cpi); extern void vp8_deblock_frame(YV12_BUFFER_CONFIG *source, YV12_BUFFER_CONFIG *post, int filt_lvl, int low_var_thresh, int flag); extern void print_parms(VP8_CONFIG *ocf, char *filenam); extern unsigned int vp8_get_processor_freq(); @@ -1708,7 +1707,6 @@ struct VP8_COMP* vp8_create_compressor(VP8_CONFIG *oxcf) CHECK_MEM_ERROR(cpi->mb.ss, vpx_calloc(sizeof(search_site), (MAX_MVSEARCH_STEPS * 8) + 1)); vp8_create_common(&cpi->common); - vp8_cmachine_specific_config(cpi); init_config(cpi, oxcf); diff --git a/vp8/encoder/picklpf.c b/vp8/encoder/picklpf.c index 441514d91..eb548191a 100644 --- a/vp8/encoder/picklpf.c +++ b/vp8/encoder/picklpf.c @@ -23,11 +23,8 @@ extern int vp8_calc_ss_err(YV12_BUFFER_CONFIG *source, YV12_BUFFER_CONFIG *dest); -extern void (*vp8_yv12_copy_partial_frame_ptr)(YV12_BUFFER_CONFIG *src_ybc, - YV12_BUFFER_CONFIG *dst_ybc); - -void vp8_yv12_copy_partial_frame(YV12_BUFFER_CONFIG *src_ybc, - YV12_BUFFER_CONFIG *dst_ybc) +void vp8_yv12_copy_partial_frame_c(YV12_BUFFER_CONFIG *src_ybc, + YV12_BUFFER_CONFIG *dst_ybc) { unsigned char *src_y, *dst_y; int yheight; @@ -173,7 +170,7 @@ void vp8cx_pick_filter_level_fast(YV12_BUFFER_CONFIG *sd, VP8_COMP *cpi) // Get the err using the previous frame's filter value. /* Copy the unfiltered / processed recon buffer to the new buffer */ - vp8_yv12_copy_partial_frame_ptr(saved_frame, cm->frame_to_show); + vp8_yv12_copy_partial_frame(saved_frame, cm->frame_to_show); vp8_loop_filter_partial_frame(cm, &cpi->mb.e_mbd, filt_val); best_err = calc_partial_ssl_err(sd, cm->frame_to_show); @@ -184,7 +181,7 @@ void vp8cx_pick_filter_level_fast(YV12_BUFFER_CONFIG *sd, VP8_COMP *cpi) while (filt_val >= min_filter_level) { // Apply the loop filter - vp8_yv12_copy_partial_frame_ptr(saved_frame, cm->frame_to_show); + vp8_yv12_copy_partial_frame(saved_frame, cm->frame_to_show); vp8_loop_filter_partial_frame(cm, &cpi->mb.e_mbd, filt_val); // Get the err for filtered frame @@ -214,7 +211,7 @@ void vp8cx_pick_filter_level_fast(YV12_BUFFER_CONFIG *sd, VP8_COMP *cpi) while (filt_val < max_filter_level) { // Apply the loop filter - vp8_yv12_copy_partial_frame_ptr(saved_frame, cm->frame_to_show); + vp8_yv12_copy_partial_frame(saved_frame, cm->frame_to_show); vp8_loop_filter_partial_frame(cm, &cpi->mb.e_mbd, filt_val); diff --git a/vp8/encoder/x86/x86_csystemdependent.c b/vp8/encoder/x86/vp8_enc_stubs_mmx.c similarity index 71% rename from vp8/encoder/x86/x86_csystemdependent.c rename to vp8/encoder/x86/vp8_enc_stubs_mmx.c index 8aa2e1fa3..e28f7f9cc 100644 --- a/vp8/encoder/x86/x86_csystemdependent.c +++ b/vp8/encoder/x86/vp8_enc_stubs_mmx.c @@ -12,11 +12,9 @@ #include "vpx_config.h" #include "vpx_rtcd.h" #include "vpx_ports/x86.h" -#include "vp8/encoder/variance.h" -#include "vp8/encoder/onyx_int.h" +#include "vp8/encoder/block.h" - -#if HAVE_MMX +void vp8_short_fdct4x4_mmx(short *input, short *output, int pitch); void vp8_short_fdct8x4_mmx(short *input, short *output, int pitch) { vp8_short_fdct4x4_mmx(input, output, pitch); @@ -78,40 +76,3 @@ void vp8_subtract_b_mmx(BLOCK *be, BLOCKD *bd, int pitch) unsigned char *predictor = &bd->predictor[0]; vp8_subtract_b_mmx_impl(z, src_stride, diff, predictor, pitch); } - -#endif - -#if HAVE_SSE2 -int vp8_mbblock_error_xmm_impl(short *coeff_ptr, short *dcoef_ptr, int dc); -int vp8_mbblock_error_xmm(MACROBLOCK *mb, int dc) -{ - short *coeff_ptr = mb->block[0].coeff; - short *dcoef_ptr = mb->e_mbd.block[0].dqcoeff; - return vp8_mbblock_error_xmm_impl(coeff_ptr, dcoef_ptr, dc); -} - -int vp8_mbuverror_xmm_impl(short *s_ptr, short *d_ptr); -int vp8_mbuverror_xmm(MACROBLOCK *mb) -{ - short *s_ptr = &mb->coeff[256]; - short *d_ptr = &mb->e_mbd.dqcoeff[256]; - return vp8_mbuverror_xmm_impl(s_ptr, d_ptr); -} - -void vp8_subtract_b_sse2_impl(unsigned char *z, int src_stride, - short *diff, unsigned char *predictor, - int pitch); -void vp8_subtract_b_sse2(BLOCK *be, BLOCKD *bd, int pitch) -{ - unsigned char *z = *(be->base_src) + be->src; - unsigned int src_stride = be->src_stride; - short *diff = &be->src_diff[0]; - unsigned char *predictor = &bd->predictor[0]; - vp8_subtract_b_sse2_impl(z, src_stride, diff, predictor, pitch); -} - -#endif - -void vp8_arch_x86_encoder_init(VP8_COMP *cpi) -{ -} diff --git a/vp8/encoder/x86/vp8_enc_stubs_sse2.c b/vp8/encoder/x86/vp8_enc_stubs_sse2.c new file mode 100644 index 000000000..68db8155a --- /dev/null +++ b/vp8/encoder/x86/vp8_enc_stubs_sse2.c @@ -0,0 +1,43 @@ +/* + * Copyright (c) 2012 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_rtcd.h" +#include "vpx_ports/x86.h" +#include "vp8/encoder/block.h" + +int vp8_mbblock_error_xmm_impl(short *coeff_ptr, short *dcoef_ptr, int dc); +int vp8_mbblock_error_xmm(MACROBLOCK *mb, int dc) +{ + short *coeff_ptr = mb->block[0].coeff; + short *dcoef_ptr = mb->e_mbd.block[0].dqcoeff; + return vp8_mbblock_error_xmm_impl(coeff_ptr, dcoef_ptr, dc); +} + +int vp8_mbuverror_xmm_impl(short *s_ptr, short *d_ptr); +int vp8_mbuverror_xmm(MACROBLOCK *mb) +{ + short *s_ptr = &mb->coeff[256]; + short *d_ptr = &mb->e_mbd.dqcoeff[256]; + return vp8_mbuverror_xmm_impl(s_ptr, d_ptr); +} + +void vp8_subtract_b_sse2_impl(unsigned char *z, int src_stride, + short *diff, unsigned char *predictor, + int pitch); +void vp8_subtract_b_sse2(BLOCK *be, BLOCKD *bd, int pitch) +{ + unsigned char *z = *(be->base_src) + be->src; + unsigned int src_stride = be->src_stride; + short *diff = &be->src_diff[0]; + unsigned char *predictor = &bd->predictor[0]; + vp8_subtract_b_sse2_impl(z, src_stride, diff, predictor, pitch); +} diff --git a/vp8/vp8cx.mk b/vp8/vp8cx.mk index 0d7120aed..b96c9adab 100644 --- a/vp8/vp8cx.mk +++ b/vp8/vp8cx.mk @@ -44,7 +44,6 @@ VP8_CX_SRCS-yes += encoder/encodemb.c VP8_CX_SRCS-yes += encoder/encodemv.c VP8_CX_SRCS-$(CONFIG_MULTITHREAD) += encoder/ethreading.c VP8_CX_SRCS-yes += encoder/firstpass.c -VP8_CX_SRCS-yes += encoder/generic/csystemdependent.c VP8_CX_SRCS-yes += encoder/block.h VP8_CX_SRCS-yes += encoder/boolhuff.h VP8_CX_SRCS-yes += encoder/bitstream.h @@ -92,12 +91,12 @@ VP8_CX_SRCS_REMOVE-yes += encoder/firstpass.c VP8_CX_SRCS_REMOVE-yes += encoder/temporal_filter.c endif -VP8_CX_SRCS-$(ARCH_X86)$(ARCH_X86_64) += encoder/x86/x86_csystemdependent.c VP8_CX_SRCS-$(HAVE_MMX) += encoder/x86/variance_mmx.c VP8_CX_SRCS-$(HAVE_MMX) += encoder/x86/variance_impl_mmx.asm VP8_CX_SRCS-$(HAVE_MMX) += encoder/x86/sad_mmx.asm VP8_CX_SRCS-$(HAVE_MMX) += encoder/x86/dct_mmx.asm VP8_CX_SRCS-$(HAVE_MMX) += encoder/x86/subtract_mmx.asm +VP8_CX_SRCS-$(HAVE_MMX) += encoder/x86/vp8_enc_stubs_mmx.c VP8_CX_SRCS-$(HAVE_SSE2) += encoder/x86/dct_sse2.asm VP8_CX_SRCS-$(HAVE_SSE2) += encoder/x86/variance_sse2.c VP8_CX_SRCS-$(HAVE_SSE2) += encoder/x86/variance_impl_sse2.asm @@ -106,6 +105,7 @@ VP8_CX_SRCS-$(HAVE_SSE2) += encoder/x86/fwalsh_sse2.asm VP8_CX_SRCS-$(HAVE_SSE2) += encoder/x86/quantize_sse2.asm VP8_CX_SRCS-$(HAVE_SSE2) += encoder/x86/subtract_sse2.asm VP8_CX_SRCS-$(HAVE_SSE2) += encoder/x86/temporal_filter_apply_sse2.asm +VP8_CX_SRCS-$(HAVE_SSE2) += encoder/x86/vp8_enc_stubs_sse2.c VP8_CX_SRCS-$(HAVE_SSE3) += encoder/x86/sad_sse3.asm VP8_CX_SRCS-$(HAVE_SSSE3) += encoder/x86/sad_ssse3.asm VP8_CX_SRCS-$(HAVE_SSSE3) += encoder/x86/variance_ssse3.c diff --git a/vp8/vp8cx_arm.mk b/vp8/vp8cx_arm.mk index 0d37f4bfe..11ebb58aa 100644 --- a/vp8/vp8cx_arm.mk +++ b/vp8/vp8cx_arm.mk @@ -13,8 +13,6 @@ #File list for arm # encoder -VP8_CX_SRCS-$(ARCH_ARM) += encoder/arm/arm_csystemdependent.c - VP8_CX_SRCS-$(ARCH_ARM) += encoder/arm/dct_arm.c VP8_CX_SRCS-$(ARCH_ARM) += encoder/arm/quantize_arm.c VP8_CX_SRCS-$(ARCH_ARM) += encoder/arm/variance_arm.c diff --git a/vpx_scale/yv12config.h b/vpx_scale/yv12config.h index 3cc4746f7..800f700b3 100644 --- a/vpx_scale/yv12config.h +++ b/vpx_scale/yv12config.h @@ -37,7 +37,7 @@ extern "C" } YUV_TYPE; - typedef struct + typedef struct yv12_buffer_config { int y_width; int y_height; -- 2.40.0