diff options
Diffstat (limited to 'vp8/common/generic/systemdependent.c')
-rw-r--r-- | vp8/common/generic/systemdependent.c | 39 |
1 files changed, 25 insertions, 14 deletions
diff --git a/vp8/common/generic/systemdependent.c b/vp8/common/generic/systemdependent.c index 0011ae0dc..b3eadaf27 100644 --- a/vp8/common/generic/systemdependent.c +++ b/vp8/common/generic/systemdependent.c @@ -1,10 +1,11 @@ /* - * Copyright (c) 2010 The VP8 project authors. All Rights Reserved. + * Copyright (c) 2010 The WebM project authors. All Rights Reserved. * - * Use of this source code is governed by a BSD-style license and patent - * grant that can be found in the LICENSE file in the root of the source - * tree. All contributing project authors may be found in the AUTHORS - * file in the root of the source tree. + * 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. */ @@ -17,6 +18,7 @@ #include "onyxc_int.h" extern void vp8_arch_x86_common_init(VP8_COMMON *ctx); +extern void vp8_arch_arm_common_init(VP8_COMMON *ctx); void (*vp8_build_intra_predictors_mby_ptr)(MACROBLOCKD *x); extern void vp8_build_intra_predictors_mby(MACROBLOCKD *x); @@ -31,16 +33,18 @@ void vp8_machine_specific_config(VP8_COMMON *ctx) rtcd->idct.idct1 = vp8_short_idct4x4llm_1_c; rtcd->idct.idct16 = vp8_short_idct4x4llm_c; - rtcd->idct.idct1_scalar = vp8_dc_only_idct_c; + rtcd->idct.idct1_scalar_add = vp8_dc_only_idct_add_c; rtcd->idct.iwalsh1 = vp8_short_inv_walsh4x4_1_c; rtcd->idct.iwalsh16 = vp8_short_inv_walsh4x4_c; rtcd->recon.copy16x16 = vp8_copy_mem16x16_c; rtcd->recon.copy8x8 = vp8_copy_mem8x8_c; rtcd->recon.copy8x4 = vp8_copy_mem8x4_c; - rtcd->recon.recon = vp8_recon_b_c; + rtcd->recon.recon = vp8_recon_b_c; rtcd->recon.recon2 = vp8_recon2b_c; - rtcd->recon.recon4 = vp8_recon4b_c; + rtcd->recon.recon4 = vp8_recon4b_c; + rtcd->recon.recon_mb = vp8_recon_mb_c; + rtcd->recon.recon_mby = vp8_recon_mby_c; rtcd->subpix.sixtap16x16 = vp8_sixtap_predict16x16_c; rtcd->subpix.sixtap8x8 = vp8_sixtap_predict8x8_c; @@ -60,15 +64,18 @@ void vp8_machine_specific_config(VP8_COMMON *ctx) rtcd->loopfilter.simple_mb_h = vp8_loop_filter_mbhs_c; rtcd->loopfilter.simple_b_h = vp8_loop_filter_bhs_c; -#if CONFIG_POSTPROC || CONFIG_VP8_ENCODER - rtcd->postproc.down = vp8_mbpost_proc_down_c; - rtcd->postproc.across = vp8_mbpost_proc_across_ip_c; - rtcd->postproc.downacross = vp8_post_proc_down_and_across_c; - rtcd->postproc.addnoise = vp8_plane_add_noise_c; +#if CONFIG_POSTPROC || (CONFIG_VP8_ENCODER && CONFIG_PSNR) + rtcd->postproc.down = vp8_mbpost_proc_down_c; + rtcd->postproc.across = vp8_mbpost_proc_across_ip_c; + rtcd->postproc.downacross = vp8_post_proc_down_and_across_c; + rtcd->postproc.addnoise = vp8_plane_add_noise_c; + rtcd->postproc.blend_mb_inner = vp8_blend_mb_inner_c; + rtcd->postproc.blend_mb_outer = vp8_blend_mb_outer_c; + rtcd->postproc.blend_b = vp8_blend_b_c; #endif #endif - // Pure C: + /* Pure C: */ vp8_build_intra_predictors_mby_ptr = vp8_build_intra_predictors_mby; vp8_build_intra_predictors_mby_s_ptr = vp8_build_intra_predictors_mby_s; @@ -76,4 +83,8 @@ void vp8_machine_specific_config(VP8_COMMON *ctx) vp8_arch_x86_common_init(ctx); #endif +#if ARCH_ARM + vp8_arch_arm_common_init(ctx); +#endif + } |