aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJun Zhao <mypopydev@gmail.com>2018-07-10 00:34:26 +0800
committerJun Zhao <jun.zhao@intel.com>2018-07-31 19:09:35 +0800
commitb8bf7408dc189668efa3e45b418349ce3a7c816e (patch)
tree702ac080ae3b66bc8a3ca529830a189525b00bfb
parenta9a433564d73b9d961c3ca16dbc74d8e090dd3fb (diff)
downloadffmpeg-b8bf7408dc189668efa3e45b418349ce3a7c816e.tar.gz
lavutil/pixelutils: add sad_32x32 in pixelutils API.
add sad_32x32 in pixelutils API, and update the fate. Signed-off-by: Jun Zhao <mypopydev@gmail.com>
-rw-r--r--libavutil/pixelutils.c2
-rw-r--r--libavutil/tests/pixelutils.c2
-rw-r--r--tests/ref/fate/pixelutils12
3 files changed, 15 insertions, 1 deletions
diff --git a/libavutil/pixelutils.c b/libavutil/pixelutils.c
index b663027b42..ebee3d6f90 100644
--- a/libavutil/pixelutils.c
+++ b/libavutil/pixelutils.c
@@ -51,12 +51,14 @@ DECLARE_BLOCK_FUNCTIONS(2)
DECLARE_BLOCK_FUNCTIONS(4)
DECLARE_BLOCK_FUNCTIONS(8)
DECLARE_BLOCK_FUNCTIONS(16)
+DECLARE_BLOCK_FUNCTIONS(32)
static const av_pixelutils_sad_fn sad_c[] = {
block_sad_2x2_c,
block_sad_4x4_c,
block_sad_8x8_c,
block_sad_16x16_c,
+ block_sad_32x32_c,
};
#endif /* CONFIG_PIXELUTILS */
diff --git a/libavutil/tests/pixelutils.c b/libavutil/tests/pixelutils.c
index ec4dc8fe8f..2f807584b3 100644
--- a/libavutil/tests/pixelutils.c
+++ b/libavutil/tests/pixelutils.c
@@ -115,7 +115,7 @@ int main(void)
goto end;
/* Exact buffer sizes, to check for overreads */
- for (i = 1; i <= 4; i++) {
+ for (i = 1; i <= 5; i++) {
for (align = 0; align < 3; align++) {
int size1, size2;
diff --git a/tests/ref/fate/pixelutils b/tests/ref/fate/pixelutils
index 493497fb88..434904e477 100644
--- a/tests/ref/fate/pixelutils
+++ b/tests/ref/fate/pixelutils
@@ -2,38 +2,47 @@
[OK] [UU] SAD [random] 4x4=1370 ref=1370
[OK] [UU] SAD [random] 8x8=5178 ref=5178
[OK] [UU] SAD [random] 16x16=20946 ref=20946
+[OK] [UU] SAD [random] 32x32=83150 ref=83150
[OK] [AU] SAD [random] 2x2=320 ref=320
[OK] [AU] SAD [random] 4x4=1522 ref=1522
[OK] [AU] SAD [random] 8x8=5821 ref=5821
[OK] [AU] SAD [random] 16x16=21951 ref=21951
+[OK] [AU] SAD [random] 32x32=86983 ref=86983
[OK] [AA] SAD [random] 2x2=276 ref=276
[OK] [AA] SAD [random] 4x4=1521 ref=1521
[OK] [AA] SAD [random] 8x8=5130 ref=5130
[OK] [AA] SAD [random] 16x16=20775 ref=20775
+[OK] [AA] SAD [random] 32x32=83402 ref=83402
[OK] [UU] SAD [max] 2x2=1020 ref=1020
[OK] [UU] SAD [max] 4x4=4080 ref=4080
[OK] [UU] SAD [max] 8x8=16320 ref=16320
[OK] [UU] SAD [max] 16x16=65280 ref=65280
+[OK] [UU] SAD [max] 32x32=261120 ref=261120
[OK] [AU] SAD [max] 2x2=1020 ref=1020
[OK] [AU] SAD [max] 4x4=4080 ref=4080
[OK] [AU] SAD [max] 8x8=16320 ref=16320
[OK] [AU] SAD [max] 16x16=65280 ref=65280
+[OK] [AU] SAD [max] 32x32=261120 ref=261120
[OK] [AA] SAD [max] 2x2=1020 ref=1020
[OK] [AA] SAD [max] 4x4=4080 ref=4080
[OK] [AA] SAD [max] 8x8=16320 ref=16320
[OK] [AA] SAD [max] 16x16=65280 ref=65280
+[OK] [AA] SAD [max] 32x32=261120 ref=261120
[OK] [UU] SAD [min] 2x2=0 ref=0
[OK] [UU] SAD [min] 4x4=0 ref=0
[OK] [UU] SAD [min] 8x8=0 ref=0
[OK] [UU] SAD [min] 16x16=0 ref=0
+[OK] [UU] SAD [min] 32x32=0 ref=0
[OK] [AU] SAD [min] 2x2=0 ref=0
[OK] [AU] SAD [min] 4x4=0 ref=0
[OK] [AU] SAD [min] 8x8=0 ref=0
[OK] [AU] SAD [min] 16x16=0 ref=0
+[OK] [AU] SAD [min] 32x32=0 ref=0
[OK] [AA] SAD [min] 2x2=0 ref=0
[OK] [AA] SAD [min] 4x4=0 ref=0
[OK] [AA] SAD [min] 8x8=0 ref=0
[OK] [AA] SAD [min] 16x16=0 ref=0
+[OK] [AA] SAD [min] 32x32=0 ref=0
[OK] [UU] SAD [small] 2x2=400 ref=400
[OK] [AU] SAD [small] 2x2=384 ref=384
[OK] [AA] SAD [small] 2x2=409 ref=409
@@ -46,3 +55,6 @@
[OK] [UU] SAD [small] 16x16=19490 ref=19490
[OK] [AU] SAD [small] 16x16=21037 ref=21037
[OK] [AA] SAD [small] 16x16=22986 ref=22986
+[OK] [UU] SAD [small] 32x32=86550 ref=86550
+[OK] [AU] SAD [small] 32x32=83656 ref=83656
+[OK] [AA] SAD [small] 32x32=85164 ref=85164 \ No newline at end of file