Commit 1dbe80bc authored by James Zern's avatar James Zern

Unify loopfilter function names

Rename aom_lpf_horizontal_edge_8() to aom_lpf_horizontal_16().
Rename aom_lpf_horizontal_edge_16() to aom_lpf_horizontal_16_dual().

based on the same change from libvpx:
7f1f35183 Unify loopfilter function names

Change-Id: I4fda7a2e3a893fc3dee0779975e2d4145c32f5d2
parent 5b0f0b89
......@@ -456,20 +456,20 @@ if (aom_config("CONFIG_PARALLEL_DEBLOCKING") ne "yes") {
specialize qw/aom_lpf_vertical_4_dual sse2 neon dspr2 msa/;
}
add_proto qw/void aom_lpf_horizontal_edge_8/, "uint8_t *s, int pitch, const uint8_t *blimit, const uint8_t *limit, const uint8_t *thresh";
add_proto qw/void aom_lpf_horizontal_16/, "uint8_t *s, int pitch, const uint8_t *blimit, const uint8_t *limit, const uint8_t *thresh";
if (aom_config("CONFIG_PARALLEL_DEBLOCKING") eq "yes") {
specialize qw/aom_lpf_horizontal_edge_8 sse2/;
specialize qw/aom_lpf_horizontal_16 sse2/;
} else {
specialize qw/aom_lpf_horizontal_edge_8 sse2 avx2 neon_asm dspr2 msa/;
$aom_lpf_horizontal_edge_8_neon_asm=aom_lpf_horizontal_edge_8_neon;
specialize qw/aom_lpf_horizontal_16 sse2 avx2 neon_asm dspr2 msa/;
$aom_lpf_horizontal_16_neon_asm=aom_lpf_horizontal_16_neon;
}
add_proto qw/void aom_lpf_horizontal_edge_16/, "uint8_t *s, int pitch, const uint8_t *blimit, const uint8_t *limit, const uint8_t *thresh";
add_proto qw/void aom_lpf_horizontal_16_dual/, "uint8_t *s, int pitch, const uint8_t *blimit, const uint8_t *limit, const uint8_t *thresh";
if (aom_config("CONFIG_PARALLEL_DEBLOCKING") eq "yes") {
specialize qw/aom_lpf_horizontal_edge_16 sse2/;
specialize qw/aom_lpf_horizontal_16_dual sse2/;
} else {
specialize qw/aom_lpf_horizontal_edge_16 sse2 avx2 neon_asm dspr2 msa/;
$aom_lpf_horizontal_edge_16_neon_asm=aom_lpf_horizontal_edge_16_neon;
specialize qw/aom_lpf_horizontal_16_dual sse2 avx2 neon_asm dspr2 msa/;
$aom_lpf_horizontal_16_dual_neon_asm=aom_lpf_horizontal_16_dual_neon;
}
add_proto qw/void aom_lpf_horizontal_8/, "uint8_t *s, int pitch, const uint8_t *blimit, const uint8_t *limit, const uint8_t *thresh";
......
......@@ -11,8 +11,8 @@
;
EXPORT |aom_lpf_horizontal_edge_8_neon|
EXPORT |aom_lpf_horizontal_edge_16_neon|
EXPORT |aom_lpf_horizontal_16_neon|
EXPORT |aom_lpf_horizontal_16_dual_neon|
EXPORT |aom_lpf_vertical_16_neon|
ARM
......@@ -121,7 +121,7 @@ h_next
ENDP ; |mb_lpf_horizontal_edge|
; void aom_lpf_horizontal_edge_8_neon(uint8_t *s, int pitch,
; void aom_lpf_horizontal_16_neon(uint8_t *s, int pitch,
; const uint8_t *blimit,
; const uint8_t *limit,
; const uint8_t *thresh)
......@@ -130,12 +130,12 @@ h_next
; r2 const uint8_t *blimit,
; r3 const uint8_t *limit,
; sp const uint8_t *thresh
|aom_lpf_horizontal_edge_8_neon| PROC
|aom_lpf_horizontal_16_neon| PROC
mov r12, #1
b mb_lpf_horizontal_edge
ENDP ; |aom_lpf_horizontal_edge_8_neon|
ENDP ; |aom_lpf_horizontal_16_neon|
; void aom_lpf_horizontal_edge_16_neon(uint8_t *s, int pitch,
; void aom_lpf_horizontal_16_dual_neon(uint8_t *s, int pitch,
; const uint8_t *blimit,
; const uint8_t *limit,
; const uint8_t *thresh)
......@@ -144,10 +144,10 @@ h_next
; r2 const uint8_t *blimit,
; r3 const uint8_t *limit,
; sp const uint8_t *thresh
|aom_lpf_horizontal_edge_16_neon| PROC
|aom_lpf_horizontal_16_dual_neon| PROC
mov r12, #2
b mb_lpf_horizontal_edge
ENDP ; |aom_lpf_horizontal_edge_16_neon|
ENDP ; |aom_lpf_horizontal_16_dual_neon|
; void aom_lpf_vertical_16_neon(uint8_t *s, int p,
; const uint8_t *blimit,
......
......@@ -605,12 +605,12 @@ static void mb_lpf_horizontal_edge_w(uint8_t *s, int p, const uint8_t *blimit,
}
}
void aom_lpf_horizontal_edge_8_c(uint8_t *s, int p, const uint8_t *blimit,
const uint8_t *limit, const uint8_t *thresh) {
void aom_lpf_horizontal_16_c(uint8_t *s, int p, const uint8_t *blimit,
const uint8_t *limit, const uint8_t *thresh) {
mb_lpf_horizontal_edge_w(s, p, blimit, limit, thresh, 1);
}
void aom_lpf_horizontal_edge_16_c(uint8_t *s, int p, const uint8_t *blimit,
void aom_lpf_horizontal_16_dual_c(uint8_t *s, int p, const uint8_t *blimit,
const uint8_t *limit, const uint8_t *thresh) {
#if CONFIG_PARALLEL_DEBLOCKING
mb_lpf_horizontal_edge_w(s, p, blimit, limit, thresh, 1);
......
......@@ -644,14 +644,14 @@ static void mb_lpf_horizontal_edge(uint8_t *src, int32_t pitch,
}
}
void aom_lpf_horizontal_edge_8_msa(uint8_t *src, int32_t pitch,
const uint8_t *b_limit_ptr,
const uint8_t *limit_ptr,
const uint8_t *thresh_ptr) {
void aom_lpf_horizontal_16_msa(uint8_t *src, int32_t pitch,
const uint8_t *b_limit_ptr,
const uint8_t *limit_ptr,
const uint8_t *thresh_ptr) {
mb_lpf_horizontal_edge(src, pitch, b_limit_ptr, limit_ptr, thresh_ptr, 1);
}
void aom_lpf_horizontal_edge_16_msa(uint8_t *src, int32_t pitch,
void aom_lpf_horizontal_16_dual_msa(uint8_t *src, int32_t pitch,
const uint8_t *b_limit_ptr,
const uint8_t *limit_ptr,
const uint8_t *thresh_ptr) {
......
......@@ -718,14 +718,13 @@ static void mb_lpf_horizontal_edge(unsigned char *s, int pitch,
}
}
void aom_lpf_horizontal_edge_8_dspr2(unsigned char *s, int pitch,
const uint8_t *blimit,
const uint8_t *limit,
const uint8_t *thresh) {
void aom_lpf_horizontal_16_dspr2(unsigned char *s, int pitch,
const uint8_t *blimit, const uint8_t *limit,
const uint8_t *thresh) {
mb_lpf_horizontal_edge(s, pitch, blimit, limit, thresh, 1);
}
void aom_lpf_horizontal_edge_16_dspr2(unsigned char *s, int pitch,
void aom_lpf_horizontal_16_dual_dspr2(unsigned char *s, int pitch,
const uint8_t *blimit,
const uint8_t *limit,
const uint8_t *thresh) {
......
......@@ -14,10 +14,10 @@
#include "./aom_dsp_rtcd.h"
#include "aom_ports/mem.h"
void aom_lpf_horizontal_edge_8_avx2(unsigned char *s, int p,
const unsigned char *_blimit,
const unsigned char *_limit,
const unsigned char *_thresh) {
void aom_lpf_horizontal_16_avx2(unsigned char *s, int p,
const unsigned char *_blimit,
const unsigned char *_limit,
const unsigned char *_thresh) {
__m128i mask, hev, flat, flat2;
const __m128i zero = _mm_set1_epi16(0);
const __m128i one = _mm_set1_epi8(1);
......@@ -368,7 +368,7 @@ DECLARE_ALIGNED(32, static const uint8_t, filt_loopfilter_avx2[32]) = {
8, 128, 9, 128, 10, 128, 11, 128, 12, 128, 13, 128, 14, 128, 15, 128
};
void aom_lpf_horizontal_edge_16_avx2(unsigned char *s, int p,
void aom_lpf_horizontal_16_dual_avx2(unsigned char *s, int p,
const unsigned char *_blimit,
const unsigned char *_limit,
const unsigned char *_thresh) {
......
......@@ -304,10 +304,10 @@ static INLINE void store_buffer_horz_8(__m128i x, int p, int num, uint8_t *s) {
#endif
}
void aom_lpf_horizontal_edge_8_sse2(unsigned char *s, int p,
const unsigned char *_blimit,
const unsigned char *_limit,
const unsigned char *_thresh) {
void aom_lpf_horizontal_16_sse2(unsigned char *s, int p,
const unsigned char *_blimit,
const unsigned char *_limit,
const unsigned char *_thresh) {
const __m128i zero = _mm_set1_epi16(0);
const __m128i one = _mm_set1_epi8(1);
const __m128i blimit = _mm_load_si128((const __m128i *)_blimit);
......@@ -1224,7 +1224,7 @@ void aom_lpf_horizontal_8_sse2(unsigned char *s, int p,
}
}
void aom_lpf_horizontal_edge_16_sse2(unsigned char *s, int p,
void aom_lpf_horizontal_16_dual_sse2(unsigned char *s, int p,
const unsigned char *_blimit,
const unsigned char *_limit,
const unsigned char *_thresh) {
......@@ -1902,7 +1902,7 @@ void aom_lpf_vertical_16_sse2(unsigned char *s, int p,
transpose(src, p, dst, 8, 2);
// Loop filtering
aom_lpf_horizontal_edge_8_sse2(t_dst + 8 * 8, 8, blimit, limit, thresh);
aom_lpf_horizontal_16_sse2(t_dst + 8 * 8, 8, blimit, limit, thresh);
src[0] = t_dst;
src[1] = t_dst + 8 * 8;
......@@ -1923,7 +1923,7 @@ void aom_lpf_vertical_16_dual_sse2(unsigned char *s, int p,
transpose8x16(s, s + 8 * p, p, t_dst + 8 * 16, 16);
// Loop filtering
aom_lpf_horizontal_edge_16_sse2(t_dst + 8 * 16, 16, blimit, limit, thresh);
aom_lpf_horizontal_16_dual_sse2(t_dst + 8 * 16, 16, blimit, limit, thresh);
// Transpose back
transpose8x16(t_dst, t_dst + 8 * 16, 16, s - 8, p);
......
......@@ -736,12 +736,11 @@ static void filter_selectively_horiz(
if (mask & 1) {
if (mask_16x16 & 1) {
if ((mask_16x16 & 3) == 3) {
aom_lpf_horizontal_edge_16(s, pitch, lfi->mblim, lfi->lim,
aom_lpf_horizontal_16_dual(s, pitch, lfi->mblim, lfi->lim,
lfi->hev_thr);
count = 2;
} else {
aom_lpf_horizontal_edge_8(s, pitch, lfi->mblim, lfi->lim,
lfi->hev_thr);
aom_lpf_horizontal_16(s, pitch, lfi->mblim, lfi->lim, lfi->hev_thr);
}
} else if (mask_8x8 & 1) {
if ((mask_8x8 & 3) == 3) {
......@@ -2495,10 +2494,10 @@ static void av1_filter_block_plane_horz(
else
#endif // CONFIG_HIGHBITDEPTH
#if CONFIG_DEBLOCK_13TAP
aom_lpf_horizontal_edge_16_c(p, dst_stride, params.mblim,
aom_lpf_horizontal_16_dual_c(p, dst_stride, params.mblim,
params.lim, params.hev_thr);
#else
aom_lpf_horizontal_edge_16(p, dst_stride, params.mblim, params.lim,
aom_lpf_horizontal_16_dual(p, dst_stride, params.mblim, params.lim,
params.hev_thr);
#endif
break;
......
......@@ -561,10 +561,10 @@ const loop8_param_t kLoop8Test6[] = {
#if !CONFIG_DEBLOCK_13TAP
// Despite the name the following funcition is doing 15-tap filtering
// which is changed to 13-tap and not yet implemented in SIMD
make_tuple(&aom_lpf_horizontal_edge_8_sse2, &aom_lpf_horizontal_edge_8_c, 8),
make_tuple(&aom_lpf_horizontal_16_sse2, &aom_lpf_horizontal_16_c, 8),
#endif
#if !CONFIG_DEBLOCK_13TAP // No SIMD implementation for deblock_13tap yet
make_tuple(&aom_lpf_horizontal_edge_16_sse2, &aom_lpf_horizontal_edge_16_c,
make_tuple(&aom_lpf_horizontal_16_dual_sse2, &aom_lpf_horizontal_16_dual_c,
8),
#endif
make_tuple(&aom_lpf_vertical_4_sse2, &aom_lpf_vertical_4_c, 8),
......@@ -612,11 +612,11 @@ INSTANTIATE_TEST_CASE_P(AVX2, Loop8Test6Param,
INSTANTIATE_TEST_CASE_P(AVX2, Loop8Test6Param,
::testing::Values(
#if !CONFIG_DEBLOCK_13TAP // No SIMD implementation for deblock_13tap yet
make_tuple(&aom_lpf_horizontal_edge_16_avx2,
&aom_lpf_horizontal_edge_16_c, 8),
make_tuple(&aom_lpf_horizontal_16_dual_avx2,
&aom_lpf_horizontal_16_dual_c, 8),
#endif
make_tuple(&aom_lpf_horizontal_edge_8_avx2,
&aom_lpf_horizontal_edge_8_c, 8)));
make_tuple(&aom_lpf_horizontal_16_avx2,
&aom_lpf_horizontal_16_c, 8)));
#endif
#if HAVE_SSE2
......@@ -710,11 +710,10 @@ INSTANTIATE_TEST_CASE_P(
// Using #if inside the macro is unsupported on MSVS but the tests are
// not
// currently built for MSVS with ARM and NEON.
make_tuple(&aom_lpf_horizontal_edge_8_neon,
&aom_lpf_horizontal_edge_8_c, 8),
make_tuple(&aom_lpf_horizontal_16_neon, &aom_lpf_horizontal_16_c, 8),
#if !CONFIG_DEBLOCK_13TAP // No SIMD implementation for deblock_13tap yet
make_tuple(&aom_lpf_horizontal_edge_16_neon,
&aom_lpf_horizontal_edge_16_c, 8),
make_tuple(&aom_lpf_horizontal_16_dual_neon,
&aom_lpf_horizontal_16_dual_c, 8),
make_tuple(&aom_lpf_vertical_16_neon, &aom_lpf_vertical_16_c, 8),
make_tuple(&aom_lpf_vertical_16_dual_neon, &aom_lpf_vertical_16_dual_c,
8),
......@@ -745,8 +744,8 @@ INSTANTIATE_TEST_CASE_P(
::testing::Values(
make_tuple(&aom_lpf_horizontal_4_dspr2, &aom_lpf_horizontal_4_c, 8),
make_tuple(&aom_lpf_horizontal_8_dspr2, &aom_lpf_horizontal_8_c, 8),
make_tuple(&aom_lpf_horizontal_edge_8, &aom_lpf_horizontal_edge_8, 8),
make_tuple(&aom_lpf_horizontal_edge_16, &aom_lpf_horizontal_edge_16, 8),
make_tuple(&aom_lpf_horizontal_16, &aom_lpf_horizontal_16, 8),
make_tuple(&aom_lpf_horizontal_16_dual, &aom_lpf_horizontal_16_dual, 8),
make_tuple(&aom_lpf_vertical_4_dspr2, &aom_lpf_vertical_4_c, 8),
#if CONFIG_DEBLOCK_13TAP // No SIMD implementation for deblock_13tap yet
make_tuple(&aom_lpf_vertical_16_dspr2, &aom_lpf_vertical_16_c, 8),
......@@ -773,11 +772,10 @@ INSTANTIATE_TEST_CASE_P(
::testing::Values(
make_tuple(&aom_lpf_horizontal_4_msa, &aom_lpf_horizontal_4_c, 8),
make_tuple(&aom_lpf_horizontal_8_msa, &aom_lpf_horizontal_8_c, 8),
make_tuple(&aom_lpf_horizontal_edge_8_msa, &aom_lpf_horizontal_edge_8_c,
8),
make_tuple(&aom_lpf_horizontal_16_msa, &aom_lpf_horizontal_16_c, 8),
#if CONFIG_DEBLOCK_13TAP // No SIMD implementation for deblock_13tap yet
make_tuple(&aom_lpf_horizontal_edge_16_msa,
&aom_lpf_horizontal_edge_16_c, 8),
make_tuple(&aom_lpf_horizontal_16_dual_msa,
&aom_lpf_horizontal_16_dual_c, 8),
make_tuple(&aom_lpf_vertical_16_msa, &aom_lpf_vertical_16_c, 8),
#endif
make_tuple(&aom_lpf_vertical_4_msa, &aom_lpf_vertical_4_c, 8),
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment