From 21ac3c8f2643c78d79399d9f597d2e437c6a8c15 Mon Sep 17 00:00:00 2001 From: Johann Date: Mon, 2 Apr 2012 11:06:35 -0700 Subject: [PATCH] Move variance and SAD RTCD definitions When the functions were moved from encoder/ to common/ the RTCD file was not updated. Change-Id: I1c98715ed51adf1a95aa2492949d8552aec88d1f --- vp8/common/rtcd_defs.sh | 52 ++++++++++++++++++++--------------------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/vp8/common/rtcd_defs.sh b/vp8/common/rtcd_defs.sh index ab9951528..9c7ebf499 100644 --- a/vp8/common/rtcd_defs.sh +++ b/vp8/common/rtcd_defs.sh @@ -207,11 +207,6 @@ prototype void vp8_bilinear_predict4x4 "unsigned char *src, int src_pitch, int x specialize vp8_bilinear_predict4x4 mmx media neon vp8_bilinear_predict4x4_media=vp8_bilinear_predict4x4_armv6 -# -# Encoder functions below this point. -# -if [ "$CONFIG_VP8_ENCODER" = "yes" ]; then - # # Whole-pixel Variance # @@ -277,27 +272,6 @@ specialize vp8_variance_halfpixvar16x16_hv mmx sse2 media neon vp8_variance_halfpixvar16x16_hv_sse2=vp8_variance_halfpixvar16x16_hv_wmt vp8_variance_halfpixvar16x16_hv_media=vp8_variance_halfpixvar16x16_hv_armv6 -# -# Sum of squares (vector) -# -prototype unsigned int vp8_get_mb_ss "const short *" -specialize vp8_get_mb_ss mmx sse2 - -# -# SSE (Sum Squared Error) -# -prototype unsigned int vp8_sub_pixel_mse16x16 "const unsigned char *src_ptr, int source_stride, int xoffset, int yoffset, const unsigned char *ref_ptr, int Refstride, unsigned int *sse" -specialize vp8_sub_pixel_mse16x16 mmx sse2 -vp8_sub_pixel_mse16x16_sse2=vp8_sub_pixel_mse16x16_wmt - -prototype unsigned int vp8_mse16x16 "const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int ref_stride, unsigned int *sse" -specialize vp8_mse16x16 mmx sse2 media neon -vp8_mse16x16_sse2=vp8_mse16x16_wmt -vp8_mse16x16_media=vp8_mse16x16_armv6 - -prototype unsigned int vp8_get4x4sse_cs "const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int ref_stride" -specialize vp8_get4x4sse_cs mmx neon - # # Single block SAD # @@ -380,6 +354,32 @@ specialize vp8_sad16x8x4d sse3 prototype void vp8_sad16x16x4d "const unsigned char *src_ptr, int source_stride, unsigned char *ref_ptr[4], int ref_stride, unsigned int *sad_array" specialize vp8_sad16x16x4d sse3 +# +# Encoder functions below this point. +# +if [ "$CONFIG_VP8_ENCODER" = "yes" ]; then + +# +# Sum of squares (vector) +# +prototype unsigned int vp8_get_mb_ss "const short *" +specialize vp8_get_mb_ss mmx sse2 + +# +# SSE (Sum Squared Error) +# +prototype unsigned int vp8_sub_pixel_mse16x16 "const unsigned char *src_ptr, int source_stride, int xoffset, int yoffset, const unsigned char *ref_ptr, int Refstride, unsigned int *sse" +specialize vp8_sub_pixel_mse16x16 mmx sse2 +vp8_sub_pixel_mse16x16_sse2=vp8_sub_pixel_mse16x16_wmt + +prototype unsigned int vp8_mse16x16 "const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int ref_stride, unsigned int *sse" +specialize vp8_mse16x16 mmx sse2 media neon +vp8_mse16x16_sse2=vp8_mse16x16_wmt +vp8_mse16x16_media=vp8_mse16x16_armv6 + +prototype unsigned int vp8_get4x4sse_cs "const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int ref_stride" +specialize vp8_get4x4sse_cs mmx neon + # # Block copy # -- 2.40.0