generic-library/vpx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

vpx_highbd_lpf_horizontal_4: remove unused count param

Browse Source 
Change-Id: I655a771e1b1a8753be5669ef9348a312ba6cfdbc
This commit is contained in:
James Zern
2016-02-11 20:59:39 -08:00
parent 5171857329
commit e7a23d703b
6 changed files with 31 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
test/lpf_8_test.cc
View File

@@ -469,8 +469,8 @@ INSTANTIATE_TEST_CASE_P(
INSTANTIATE_TEST_CASE_P( INSTANTIATE_TEST_CASE_P(
SSE2, Loop8Test6Param, SSE2, Loop8Test6Param,
::testing::Values( ::testing::Values(
make_tuple(&vpx_highbd_lpf_horizontal_4_sse2, make_tuple(&wrapper_nc<vpx_highbd_lpf_horizontal_4_sse2>,
&vpx_highbd_lpf_horizontal_4_c, 8, 1), &wrapper_nc<vpx_highbd_lpf_horizontal_4_c>, 8, 1),
make_tuple(&wrapper_nc<vpx_highbd_lpf_vertical_4_sse2>, make_tuple(&wrapper_nc<vpx_highbd_lpf_vertical_4_sse2>,
&wrapper_nc<vpx_highbd_lpf_vertical_4_c>, 8, 1), &wrapper_nc<vpx_highbd_lpf_vertical_4_c>, 8, 1),
make_tuple(&wrapper_nc<vpx_highbd_lpf_horizontal_8_sse2>, make_tuple(&wrapper_nc<vpx_highbd_lpf_horizontal_8_sse2>,
@@ -483,8 +483,8 @@ INSTANTIATE_TEST_CASE_P(
&wrapper_nc<vpx_highbd_lpf_vertical_8_c>, 8, 1), &wrapper_nc<vpx_highbd_lpf_vertical_8_c>, 8, 1),
make_tuple(&wrapper_nc<vpx_highbd_lpf_vertical_16_sse2>, make_tuple(&wrapper_nc<vpx_highbd_lpf_vertical_16_sse2>,
&wrapper_nc<vpx_highbd_lpf_vertical_16_c>, 8, 1), &wrapper_nc<vpx_highbd_lpf_vertical_16_c>, 8, 1),
make_tuple(&vpx_highbd_lpf_horizontal_4_sse2, make_tuple(&wrapper_nc<vpx_highbd_lpf_horizontal_4_sse2>,
&vpx_highbd_lpf_horizontal_4_c, 10, 1), &wrapper_nc<vpx_highbd_lpf_horizontal_4_c>, 10, 1),
make_tuple(&wrapper_nc<vpx_highbd_lpf_vertical_4_sse2>, make_tuple(&wrapper_nc<vpx_highbd_lpf_vertical_4_sse2>,
&wrapper_nc<vpx_highbd_lpf_vertical_4_c>, 10, 1), &wrapper_nc<vpx_highbd_lpf_vertical_4_c>, 10, 1),
make_tuple(&wrapper_nc<vpx_highbd_lpf_horizontal_8_sse2>, make_tuple(&wrapper_nc<vpx_highbd_lpf_horizontal_8_sse2>,
@@ -497,8 +497,8 @@ INSTANTIATE_TEST_CASE_P(
&wrapper_nc<vpx_highbd_lpf_vertical_8_c>, 10, 1), &wrapper_nc<vpx_highbd_lpf_vertical_8_c>, 10, 1),
make_tuple(&wrapper_nc<vpx_highbd_lpf_vertical_16_sse2>, make_tuple(&wrapper_nc<vpx_highbd_lpf_vertical_16_sse2>,
&wrapper_nc<vpx_highbd_lpf_vertical_16_c>, 10, 1), &wrapper_nc<vpx_highbd_lpf_vertical_16_c>, 10, 1),
make_tuple(&vpx_highbd_lpf_horizontal_4_sse2, make_tuple(&wrapper_nc<vpx_highbd_lpf_horizontal_4_sse2>,
&vpx_highbd_lpf_horizontal_4_c, 12, 1), &wrapper_nc<vpx_highbd_lpf_horizontal_4_c>, 12, 1),
make_tuple(&wrapper_nc<vpx_highbd_lpf_vertical_4_sse2>, make_tuple(&wrapper_nc<vpx_highbd_lpf_vertical_4_sse2>,
&wrapper_nc<vpx_highbd_lpf_vertical_4_c>, 12, 1), &wrapper_nc<vpx_highbd_lpf_vertical_4_c>, 12, 1),
make_tuple(&wrapper_nc<vpx_highbd_lpf_horizontal_8_sse2>, make_tuple(&wrapper_nc<vpx_highbd_lpf_horizontal_8_sse2>,

16
vp10/common/loopfilter.c
View File

@@ -633,10 +633,10 @@ static void highbd_filter_selectively_horiz(uint16_t *s, int pitch,
} else { } else {
if (mask_4x4_int & 1) { if (mask_4x4_int & 1) {
vpx_highbd_lpf_horizontal_4(s + 4 * pitch, pitch, lfi->mblim, vpx_highbd_lpf_horizontal_4(s + 4 * pitch, pitch, lfi->mblim,
lfi->lim, lfi->hev_thr, 1, bd); lfi->lim, lfi->hev_thr, bd);
} else if (mask_4x4_int & 2) { } else if (mask_4x4_int & 2) {
vpx_highbd_lpf_horizontal_4(s + 8 + 4 * pitch, pitch, lfin->mblim, vpx_highbd_lpf_horizontal_4(s + 8 + 4 * pitch, pitch, lfin->mblim,
lfin->lim, lfin->hev_thr, 1, bd); lfin->lim, lfin->hev_thr, bd);
} }
} }
count = 2; count = 2;
@@ -646,7 +646,7 @@ static void highbd_filter_selectively_horiz(uint16_t *s, int pitch,
if (mask_4x4_int & 1) { if (mask_4x4_int & 1) {
vpx_highbd_lpf_horizontal_4(s + 4 * pitch, pitch, lfi->mblim, vpx_highbd_lpf_horizontal_4(s + 4 * pitch, pitch, lfi->mblim,
lfi->lim, lfi->hev_thr, 1, bd); lfi->lim, lfi->hev_thr, bd);
} }
} }
} else if (mask_4x4 & 1) { } else if (mask_4x4 & 1) {
@@ -665,25 +665,25 @@ static void highbd_filter_selectively_horiz(uint16_t *s, int pitch,
} else { } else {
if (mask_4x4_int & 1) { if (mask_4x4_int & 1) {
vpx_highbd_lpf_horizontal_4(s + 4 * pitch, pitch, lfi->mblim, vpx_highbd_lpf_horizontal_4(s + 4 * pitch, pitch, lfi->mblim,
lfi->lim, lfi->hev_thr, 1, bd); lfi->lim, lfi->hev_thr, bd);
} else if (mask_4x4_int & 2) { } else if (mask_4x4_int & 2) {
vpx_highbd_lpf_horizontal_4(s + 8 + 4 * pitch, pitch, lfin->mblim, vpx_highbd_lpf_horizontal_4(s + 8 + 4 * pitch, pitch, lfin->mblim,
lfin->lim, lfin->hev_thr, 1, bd); lfin->lim, lfin->hev_thr, bd);
} }
} }
count = 2; count = 2;
} else { } else {
vpx_highbd_lpf_horizontal_4(s, pitch, lfi->mblim, lfi->lim, vpx_highbd_lpf_horizontal_4(s, pitch, lfi->mblim, lfi->lim,
lfi->hev_thr, 1, bd); lfi->hev_thr, bd);
if (mask_4x4_int & 1) { if (mask_4x4_int & 1) {
vpx_highbd_lpf_horizontal_4(s + 4 * pitch, pitch, lfi->mblim, vpx_highbd_lpf_horizontal_4(s + 4 * pitch, pitch, lfi->mblim,
lfi->lim, lfi->hev_thr, 1, bd); lfi->lim, lfi->hev_thr, bd);
} }
} }
} else if (mask_4x4_int & 1) { } else if (mask_4x4_int & 1) {
vpx_highbd_lpf_horizontal_4(s + 4 * pitch, pitch, lfi->mblim, lfi->lim, vpx_highbd_lpf_horizontal_4(s + 4 * pitch, pitch, lfi->mblim, lfi->lim,
lfi->hev_thr, 1, bd); lfi->hev_thr, bd);
} }
} }
s += 8 * count; s += 8 * count;

16
vp9/common/vp9_loopfilter.c
View File

@@ -633,10 +633,10 @@ static void highbd_filter_selectively_horiz(uint16_t *s, int pitch,
} else { } else {
if (mask_4x4_int & 1) { if (mask_4x4_int & 1) {
vpx_highbd_lpf_horizontal_4(s + 4 * pitch, pitch, lfi->mblim, vpx_highbd_lpf_horizontal_4(s + 4 * pitch, pitch, lfi->mblim,
lfi->lim, lfi->hev_thr, 1, bd); lfi->lim, lfi->hev_thr, bd);
} else if (mask_4x4_int & 2) { } else if (mask_4x4_int & 2) {
vpx_highbd_lpf_horizontal_4(s + 8 + 4 * pitch, pitch, lfin->mblim, vpx_highbd_lpf_horizontal_4(s + 8 + 4 * pitch, pitch, lfin->mblim,
lfin->lim, lfin->hev_thr, 1, bd); lfin->lim, lfin->hev_thr, bd);
} }
} }
count = 2; count = 2;
@@ -646,7 +646,7 @@ static void highbd_filter_selectively_horiz(uint16_t *s, int pitch,
if (mask_4x4_int & 1) { if (mask_4x4_int & 1) {
vpx_highbd_lpf_horizontal_4(s + 4 * pitch, pitch, lfi->mblim, vpx_highbd_lpf_horizontal_4(s + 4 * pitch, pitch, lfi->mblim,
lfi->lim, lfi->hev_thr, 1, bd); lfi->lim, lfi->hev_thr, bd);
} }
} }
} else if (mask_4x4 & 1) { } else if (mask_4x4 & 1) {
@@ -665,25 +665,25 @@ static void highbd_filter_selectively_horiz(uint16_t *s, int pitch,
} else { } else {
if (mask_4x4_int & 1) { if (mask_4x4_int & 1) {
vpx_highbd_lpf_horizontal_4(s + 4 * pitch, pitch, lfi->mblim, vpx_highbd_lpf_horizontal_4(s + 4 * pitch, pitch, lfi->mblim,
lfi->lim, lfi->hev_thr, 1, bd); lfi->lim, lfi->hev_thr, bd);
} else if (mask_4x4_int & 2) { } else if (mask_4x4_int & 2) {
vpx_highbd_lpf_horizontal_4(s + 8 + 4 * pitch, pitch, lfin->mblim, vpx_highbd_lpf_horizontal_4(s + 8 + 4 * pitch, pitch, lfin->mblim,
lfin->lim, lfin->hev_thr, 1, bd); lfin->lim, lfin->hev_thr, bd);
} }
} }
count = 2; count = 2;
} else { } else {
vpx_highbd_lpf_horizontal_4(s, pitch, lfi->mblim, lfi->lim, vpx_highbd_lpf_horizontal_4(s, pitch, lfi->mblim, lfi->lim,
lfi->hev_thr, 1, bd); lfi->hev_thr, bd);
if (mask_4x4_int & 1) { if (mask_4x4_int & 1) {
vpx_highbd_lpf_horizontal_4(s + 4 * pitch, pitch, lfi->mblim, vpx_highbd_lpf_horizontal_4(s + 4 * pitch, pitch, lfi->mblim,
lfi->lim, lfi->hev_thr, 1, bd); lfi->lim, lfi->hev_thr, bd);
} }
} }
} else if (mask_4x4_int & 1) { } else if (mask_4x4_int & 1) {
vpx_highbd_lpf_horizontal_4(s + 4 * pitch, pitch, lfi->mblim, lfi->lim, vpx_highbd_lpf_horizontal_4(s + 4 * pitch, pitch, lfi->mblim, lfi->lim,
lfi->hev_thr, 1, bd); lfi->hev_thr, bd);
} }
} }
s += 8 * count; s += 8 * count;

8
vpx_dsp/loopfilter.c
View File

@@ -445,12 +445,12 @@ static INLINE void highbd_filter4(int8_t mask, uint8_t thresh, uint16_t *op1,
void vpx_highbd_lpf_horizontal_4_c(uint16_t *s, int p /* pitch */, void vpx_highbd_lpf_horizontal_4_c(uint16_t *s, int p /* pitch */,
const uint8_t *blimit, const uint8_t *limit, const uint8_t *blimit, const uint8_t *limit,
const uint8_t *thresh, int count, int bd) { const uint8_t *thresh, int bd) {
int i; int i;
// loop filter designed to work using chars so that we can make maximum use // loop filter designed to work using chars so that we can make maximum use
// of 8 bit simd instructions. // of 8 bit simd instructions.
for (i = 0; i < 8 * count; ++i) { for (i = 0; i < 8; ++i) {
const uint16_t p3 = s[-4 * p]; const uint16_t p3 = s[-4 * p];
const uint16_t p2 = s[-3 * p]; const uint16_t p2 = s[-3 * p];
const uint16_t p1 = s[-2 * p]; const uint16_t p1 = s[-2 * p];
@@ -474,8 +474,8 @@ void vpx_highbd_lpf_horizontal_4_dual_c(uint16_t *s, int p,
const uint8_t *limit1, const uint8_t *limit1,
const uint8_t *thresh1, const uint8_t *thresh1,
int bd) { int bd) {
vpx_highbd_lpf_horizontal_4_c(s, p, blimit0, limit0, thresh0, 1, bd); vpx_highbd_lpf_horizontal_4_c(s, p, blimit0, limit0, thresh0, bd);
vpx_highbd_lpf_horizontal_4_c(s + 8, p, blimit1, limit1, thresh1, 1, bd); vpx_highbd_lpf_horizontal_4_c(s + 8, p, blimit1, limit1, thresh1, bd);
} }
void vpx_highbd_lpf_vertical_4_c(uint16_t *s, int pitch, const uint8_t *blimit, void vpx_highbd_lpf_vertical_4_c(uint16_t *s, int pitch, const uint8_t *blimit,

2
vpx_dsp/vpx_dsp_rtcd_defs.pl
View File

@@ -593,7 +593,7 @@ if (vpx_config("CONFIG_VP9_HIGHBITDEPTH") eq "yes") {
add_proto qw/void vpx_highbd_lpf_horizontal_8_dual/, "uint16_t *s, int pitch, const uint8_t *blimit0, const uint8_t *limit0, const uint8_t *thresh0, const uint8_t *blimit1, const uint8_t *limit1, const uint8_t *thresh1, int bd"; add_proto qw/void vpx_highbd_lpf_horizontal_8_dual/, "uint16_t *s, int pitch, const uint8_t *blimit0, const uint8_t *limit0, const uint8_t *thresh0, const uint8_t *blimit1, const uint8_t *limit1, const uint8_t *thresh1, int bd";
specialize qw/vpx_highbd_lpf_horizontal_8_dual sse2/; specialize qw/vpx_highbd_lpf_horizontal_8_dual sse2/;
add_proto qw/void vpx_highbd_lpf_horizontal_4/, "uint16_t *s, int pitch, const uint8_t *blimit, const uint8_t *limit, const uint8_t *thresh, int count, int bd"; add_proto qw/void vpx_highbd_lpf_horizontal_4/, "uint16_t *s, int pitch, const uint8_t *blimit, const uint8_t *limit, const uint8_t *thresh, int bd";
specialize qw/vpx_highbd_lpf_horizontal_4 sse2/; specialize qw/vpx_highbd_lpf_horizontal_4 sse2/;
add_proto qw/void vpx_highbd_lpf_horizontal_4_dual/, "uint16_t *s, int pitch, const uint8_t *blimit0, const uint8_t *limit0, const uint8_t *thresh0, const uint8_t *blimit1, const uint8_t *limit1, const uint8_t *thresh1, int bd"; add_proto qw/void vpx_highbd_lpf_horizontal_4_dual/, "uint16_t *s, int pitch, const uint8_t *blimit0, const uint8_t *limit0, const uint8_t *thresh0, const uint8_t *blimit1, const uint8_t *limit1, const uint8_t *thresh1, int bd";

12
vpx_dsp/x86/highbd_loopfilter_sse2.c
View File

@@ -770,7 +770,7 @@ void vpx_highbd_lpf_horizontal_4_sse2(uint16_t *s, int p,
const uint8_t *_blimit, const uint8_t *_blimit,
const uint8_t *_limit, const uint8_t *_limit,
const uint8_t *_thresh, const uint8_t *_thresh,
int count, int bd) { int bd) {
const __m128i zero = _mm_set1_epi16(0); const __m128i zero = _mm_set1_epi16(0);
__m128i blimit, limit, thresh; __m128i blimit, limit, thresh;
__m128i mask, hev, flat; __m128i mask, hev, flat;
@@ -810,8 +810,6 @@ void vpx_highbd_lpf_horizontal_4_sse2(uint16_t *s, int p,
__m128i work_a; __m128i work_a;
__m128i filter1, filter2; __m128i filter1, filter2;
(void)count;
if (bd == 8) { if (bd == 8) {
blimit = _mm_unpacklo_epi8(_mm_load_si128((const __m128i *)_blimit), zero); blimit = _mm_unpacklo_epi8(_mm_load_si128((const __m128i *)_blimit), zero);
limit = _mm_unpacklo_epi8(_mm_load_si128((const __m128i *)_limit), zero); limit = _mm_unpacklo_epi8(_mm_load_si128((const __m128i *)_limit), zero);
@@ -941,9 +939,8 @@ void vpx_highbd_lpf_horizontal_4_dual_sse2(uint16_t *s, int p,
const uint8_t *_limit1, const uint8_t *_limit1,
const uint8_t *_thresh1, const uint8_t *_thresh1,
int bd) { int bd) {
vpx_highbd_lpf_horizontal_4_sse2(s, p, _blimit0, _limit0, _thresh0, 1, bd); vpx_highbd_lpf_horizontal_4_sse2(s, p, _blimit0, _limit0, _thresh0, bd);
vpx_highbd_lpf_horizontal_4_sse2(s + 8, p, _blimit1, _limit1, _thresh1, 1, vpx_highbd_lpf_horizontal_4_sse2(s + 8, p, _blimit1, _limit1, _thresh1, bd);
bd);
} }
static INLINE void highbd_transpose(uint16_t *src[], int in_p, static INLINE void highbd_transpose(uint16_t *src[], int in_p,
@@ -1067,8 +1064,7 @@ void vpx_highbd_lpf_vertical_4_sse2(uint16_t *s, int p,
highbd_transpose(src, p, dst, 8, 1); highbd_transpose(src, p, dst, 8, 1);
// Loop filtering // Loop filtering
vpx_highbd_lpf_horizontal_4_sse2(t_dst + 4 * 8, 8, blimit, limit, thresh, 1, vpx_highbd_lpf_horizontal_4_sse2(t_dst + 4 * 8, 8, blimit, limit, thresh, bd);
bd);
src[0] = t_dst; src[0] = t_dst;
dst[0] = s - 4; dst[0] = s - 4;