From: Konstantinos Margaritis Date: Sun, 25 Sep 2022 16:55:43 +0000 (+0000) Subject: remove functions as not relevant for this test X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=34d392f83b171d160a83b53db5da3c09202ac273;p=openpower-isa.git remove functions as not relevant for this test --- diff --git a/media/video/libvpx/variancefuncs_svp64.c b/media/video/libvpx/variancefuncs_svp64.c index 7547c632..b7e4cf41 100644 --- a/media/video/libvpx/variancefuncs_svp64.c +++ b/media/video/libvpx/variancefuncs_svp64.c @@ -18,82 +18,6 @@ #define FILTER_BITS 7 -static const uint8_t bilinear_filters[8][2] = { - { 128, 0 }, { 112, 16 }, { 96, 32 }, { 80, 48 }, - { 64, 64 }, { 48, 80 }, { 32, 96 }, { 16, 112 }, -}; - -// Applies a 1-D 2-tap bilinear filter to the source block in either horizontal -// or vertical direction to produce the filtered output block. Used to implement -// the first-pass of 2-D separable filter. -// -// Produces int16_t output to retain precision for the next pass. Two filter -// taps should sum to FILTER_WEIGHT. pixel_step defines whether the filter is -// applied horizontally (pixel_step = 1) or vertically (pixel_step = stride). -// It defines the offset required to move from one input to the next. -static void var_filter_block2d_bil_first_pass_svp64( - const uint8_t *src_ptr, uint16_t *ref_ptr, unsigned int src_pixels_per_line, - int pixel_step, unsigned int output_height, unsigned int output_width, - const uint8_t *filter) { - unsigned int i, j; - - for (i = 0; i < output_height; ++i) { - for (j = 0; j < output_width; ++j) { - ref_ptr[j] = ROUND_POWER_OF_TWO( - (int)src_ptr[0] * filter[0] + (int)src_ptr[pixel_step] * filter[1], - FILTER_BITS); - - ++src_ptr; - } - - src_ptr += src_pixels_per_line - output_width; - ref_ptr += output_width; - } -} - -// Applies a 1-D 2-tap bilinear filter to the source block in either horizontal -// or vertical direction to produce the filtered output block. Used to implement -// the second-pass of 2-D separable filter. -// -// Requires 16-bit input as produced by filter_block2d_bil_first_pass. Two -// filter taps should sum to FILTER_WEIGHT. pixel_step defines whether the -// filter is applied horizontally (pixel_step = 1) or vertically -// (pixel_step = stride). It defines the offset required to move from one input -// to the next. Output is 8-bit. -static void var_filter_block2d_bil_second_pass_svp64( - const uint16_t *src_ptr, uint8_t *ref_ptr, unsigned int src_pixels_per_line, - unsigned int pixel_step, unsigned int output_height, - unsigned int output_width, const uint8_t *filter) { - unsigned int i, j; - - for (i = 0; i < output_height; ++i) { - for (j = 0; j < output_width; ++j) { - ref_ptr[j] = ROUND_POWER_OF_TWO( - (int)src_ptr[0] * filter[0] + (int)src_ptr[pixel_step] * filter[1], - FILTER_BITS); - ++src_ptr; - } - - src_ptr += src_pixels_per_line - output_width; - ref_ptr += output_width; - } -} - -void vpx_comp_avg_pred_svp64(uint8_t *comp_pred, const uint8_t *pred, int width, - int height, const uint8_t *ref, int ref_stride) { - int i, j; - - for (i = 0; i < height; ++i) { - for (j = 0; j < width; ++j) { - const int tmp = pred[j] + ref[j]; - comp_pred[j] = ROUND_POWER_OF_TWO(tmp, 1); - } - comp_pred += width; - pred += width; - ref += ref_stride; - } -} - #define VAR(W, H) \ uint32_t vpx_variance##W##x##H##_svp64(const uint8_t *src_ptr, int src_stride, \ const uint8_t *ref_ptr, int ref_stride, \ @@ -103,40 +27,6 @@ void vpx_comp_avg_pred_svp64(uint8_t *comp_pred, const uint8_t *pred, int width, return *sse - (uint32_t)(((int64_t)sum * sum) / (W * H)); \ } -#define SUBPIX_VAR(W, H) \ - uint32_t vpx_sub_pixel_variance##W##x##H##_svp64( \ - const uint8_t *src_ptr, int src_stride, int x_offset, int y_offset, \ - const uint8_t *ref_ptr, int ref_stride, uint32_t *sse) { \ - uint16_t fdata3[(H + 1) * W]; \ - uint8_t temp2[H * W]; \ - \ - var_filter_block2d_bil_first_pass_svp64(src_ptr, fdata3, src_stride, 1, H + 1, \ - W, bilinear_filters[x_offset]); \ - var_filter_block2d_bil_second_pass_svp64(fdata3, temp2, W, W, H, W, \ - bilinear_filters[y_offset]); \ - \ - return vpx_variance##W##x##H##_svp64(temp2, W, ref_ptr, ref_stride, sse);\ - } - -#define SUBPIX_AVG_VAR(W, H) \ - uint32_t vpx_sub_pixel_avg_variance##W##x##H##_svp64( \ - const uint8_t *src_ptr, int src_stride, int x_offset, int y_offset, \ - const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, \ - const uint8_t *second_pred) { \ - uint16_t fdata3[(H + 1) * W]; \ - uint8_t temp2[H * W]; \ - DECLARE_ALIGNED(16, uint8_t, temp3[H * W]); \ - \ - var_filter_block2d_bil_first_pass_svp64(src_ptr, fdata3, src_stride, 1, H + 1, \ - W, bilinear_filters[x_offset]); \ - var_filter_block2d_bil_second_pass_svp64(fdata3, temp2, W, W, H, W, \ - bilinear_filters[y_offset]); \ - \ - vpx_comp_avg_pred_svp64(temp3, second_pred, W, H, temp2, W); \ - \ - return vpx_variance##W##x##H##_svp64(temp3, W, ref_ptr, ref_stride, sse);\ - } - /* Identical to the variance call except it takes an additional parameter, sum, * and returns that value using pass-by-reference instead of returning * sse - sum^2 / w*h @@ -163,13 +53,8 @@ void vpx_comp_avg_pred_svp64(uint8_t *comp_pred, const uint8_t *pred, int width, /* All three forms of the variance are available in the same sizes. */ #define VARIANCES(W, H) \ - VAR(W, H) \ - SUBPIX_VAR(W, H) \ - SUBPIX_AVG_VAR(W, H) + VAR(W, H) -VARIANCES(64, 64) -VARIANCES(64, 32) -VARIANCES(32, 64) VARIANCES(32, 32) VARIANCES(32, 16) VARIANCES(16, 32)