Index: source/libvpx/vpx_dsp/mips/convolve2_avg_horiz_dspr2.c |
diff --git a/source/libvpx/vpx_dsp/mips/vpx_convolve2_avg_horiz_dspr2.c b/source/libvpx/vpx_dsp/mips/convolve2_avg_horiz_dspr2.c |
similarity index 95% |
rename from source/libvpx/vpx_dsp/mips/vpx_convolve2_avg_horiz_dspr2.c |
rename to source/libvpx/vpx_dsp/mips/convolve2_avg_horiz_dspr2.c |
index b8f33f697469dbf29b1719aede510be2fde368f6..932a73d39b17beda50b0ac1e59fafb62d5cf0a2b 100644 |
--- a/source/libvpx/vpx_dsp/mips/vpx_convolve2_avg_horiz_dspr2.c |
+++ b/source/libvpx/vpx_dsp/mips/convolve2_avg_horiz_dspr2.c |
@@ -12,7 +12,7 @@ |
#include <stdio.h> |
#include "./vpx_dsp_rtcd.h" |
-#include "vpx_dsp/mips/vpx_common_dspr2.h" |
+#include "vpx_dsp/mips/convolve_common_dspr2.h" |
#include "vpx_dsp/vpx_convolve.h" |
#include "vpx_dsp/vpx_dsp_common.h" |
#include "vpx_ports/mem.h" |
@@ -768,64 +768,58 @@ void vpx_convolve2_avg_horiz_dspr2(const uint8_t *src, ptrdiff_t src_stride, |
const int16_t *filter_x, int x_step_q4, |
const int16_t *filter_y, int y_step_q4, |
int w, int h) { |
- if (16 == x_step_q4) { |
- uint32_t pos = 38; |
- |
- /* bit positon for extract from acc */ |
- __asm__ __volatile__ ( |
- "wrdsp %[pos], 1 \n\t" |
- : |
- : [pos] "r" (pos) |
- ); |
- |
- /* prefetch data to cache memory */ |
- prefetch_load(src); |
- prefetch_load(src + 32); |
- prefetch_store(dst); |
- |
- switch (w) { |
- case 4: |
- convolve_bi_avg_horiz_4_dspr2(src, src_stride, |
- dst, dst_stride, |
- filter_x, h); |
- break; |
- case 8: |
- convolve_bi_avg_horiz_8_dspr2(src, src_stride, |
- dst, dst_stride, |
- filter_x, h); |
- break; |
- case 16: |
- convolve_bi_avg_horiz_16_dspr2(src, src_stride, |
- dst, dst_stride, |
- filter_x, h, 1); |
- break; |
- case 32: |
- convolve_bi_avg_horiz_16_dspr2(src, src_stride, |
- dst, dst_stride, |
- filter_x, h, 2); |
- break; |
- case 64: |
- prefetch_load(src + 64); |
- prefetch_store(dst + 32); |
- |
- convolve_bi_avg_horiz_64_dspr2(src, src_stride, |
- dst, dst_stride, |
- filter_x, h); |
- break; |
- default: |
- vpx_convolve8_avg_horiz_c(src, src_stride, |
- dst, dst_stride, |
- filter_x, x_step_q4, |
- filter_y, y_step_q4, |
- w, h); |
- break; |
- } |
- } else { |
- vpx_convolve8_avg_horiz_c(src, src_stride, |
- dst, dst_stride, |
- filter_x, x_step_q4, |
- filter_y, y_step_q4, |
- w, h); |
+ uint32_t pos = 38; |
+ |
+ assert(x_step_q4 == 16); |
+ |
+ /* bit positon for extract from acc */ |
+ __asm__ __volatile__ ( |
+ "wrdsp %[pos], 1 \n\t" |
+ : |
+ : [pos] "r" (pos) |
+ ); |
+ |
+ /* prefetch data to cache memory */ |
+ prefetch_load(src); |
+ prefetch_load(src + 32); |
+ prefetch_store(dst); |
+ |
+ switch (w) { |
+ case 4: |
+ convolve_bi_avg_horiz_4_dspr2(src, src_stride, |
+ dst, dst_stride, |
+ filter_x, h); |
+ break; |
+ case 8: |
+ convolve_bi_avg_horiz_8_dspr2(src, src_stride, |
+ dst, dst_stride, |
+ filter_x, h); |
+ break; |
+ case 16: |
+ convolve_bi_avg_horiz_16_dspr2(src, src_stride, |
+ dst, dst_stride, |
+ filter_x, h, 1); |
+ break; |
+ case 32: |
+ convolve_bi_avg_horiz_16_dspr2(src, src_stride, |
+ dst, dst_stride, |
+ filter_x, h, 2); |
+ break; |
+ case 64: |
+ prefetch_load(src + 64); |
+ prefetch_store(dst + 32); |
+ |
+ convolve_bi_avg_horiz_64_dspr2(src, src_stride, |
+ dst, dst_stride, |
+ filter_x, h); |
+ break; |
+ default: |
+ vpx_convolve8_avg_horiz_c(src, src_stride, |
+ dst, dst_stride, |
+ filter_x, x_step_q4, |
+ filter_y, y_step_q4, |
+ w, h); |
+ break; |
} |
} |
#endif |