From 68569dee1416593955c1570d638b3d9250b33012 Mon Sep 17 00:00:00 2001 From: trav90 Date: Mon, 15 Oct 2018 21:45:30 -0500 Subject: Import aom library This is the reference implementation for the Alliance for Open Media's av1 video code. The commit used was 4d668d7feb1f8abd809d1bca0418570a7f142a36. --- third_party/aom/test/util.h | 46 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 third_party/aom/test/util.h (limited to 'third_party/aom/test/util.h') diff --git a/third_party/aom/test/util.h b/third_party/aom/test/util.h new file mode 100644 index 000000000..a20fab65c --- /dev/null +++ b/third_party/aom/test/util.h @@ -0,0 +1,46 @@ +/* + * Copyright (c) 2016, Alliance for Open Media. All rights reserved + * + * This source code is subject to the terms of the BSD 2 Clause License and + * the Alliance for Open Media Patent License 1.0. If the BSD 2 Clause License + * was not distributed with this source code in the LICENSE file, you can + * obtain it at www.aomedia.org/license/software. If the Alliance for Open + * Media Patent License 1.0 was not distributed with this source code in the + * PATENTS file, you can obtain it at www.aomedia.org/license/patent. + */ + +#ifndef TEST_UTIL_H_ +#define TEST_UTIL_H_ + +#include +#include +#include "third_party/googletest/src/googletest/include/gtest/gtest.h" +#include "aom/aom_image.h" + +// Macros +#define GET_PARAM(k) std::tr1::get(GetParam()) + +inline double compute_psnr(const aom_image_t *img1, const aom_image_t *img2) { + assert((img1->fmt == img2->fmt) && (img1->d_w == img2->d_w) && + (img1->d_h == img2->d_h)); + + const unsigned int width_y = img1->d_w; + const unsigned int height_y = img1->d_h; + unsigned int i, j; + + int64_t sqrerr = 0; + for (i = 0; i < height_y; ++i) + for (j = 0; j < width_y; ++j) { + int64_t d = img1->planes[AOM_PLANE_Y][i * img1->stride[AOM_PLANE_Y] + j] - + img2->planes[AOM_PLANE_Y][i * img2->stride[AOM_PLANE_Y] + j]; + sqrerr += d * d; + } + double mse = static_cast(sqrerr) / (width_y * height_y); + double psnr = 100.0; + if (mse > 0.0) { + psnr = 10 * log10(255.0 * 255.0 / mse); + } + return psnr; +} + +#endif // TEST_UTIL_H_ -- cgit v1.2.3 From 7369c7d7a5eed32963d8af37658286617919f91c Mon Sep 17 00:00:00 2001 From: trav90 Date: Thu, 18 Oct 2018 06:04:57 -0500 Subject: Update aom to commit id f5bdeac22930ff4c6b219be49c843db35970b918 --- third_party/aom/test/util.h | 1 + 1 file changed, 1 insertion(+) (limited to 'third_party/aom/test/util.h') diff --git a/third_party/aom/test/util.h b/third_party/aom/test/util.h index a20fab65c..d1587b6ea 100644 --- a/third_party/aom/test/util.h +++ b/third_party/aom/test/util.h @@ -15,6 +15,7 @@ #include #include #include "third_party/googletest/src/googletest/include/gtest/gtest.h" +#include "aom/aom_integer.h" #include "aom/aom_image.h" // Macros -- cgit v1.2.3 From bbcc64772580c8a979288791afa02d30bc476d2e Mon Sep 17 00:00:00 2001 From: trav90 Date: Fri, 19 Oct 2018 21:52:15 -0500 Subject: Update aom to v1.0.0 Update aom to commit id d14c5bb4f336ef1842046089849dee4a301fbbf0. --- third_party/aom/test/util.h | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'third_party/aom/test/util.h') diff --git a/third_party/aom/test/util.h b/third_party/aom/test/util.h index d1587b6ea..db00875ef 100644 --- a/third_party/aom/test/util.h +++ b/third_party/aom/test/util.h @@ -17,9 +17,10 @@ #include "third_party/googletest/src/googletest/include/gtest/gtest.h" #include "aom/aom_integer.h" #include "aom/aom_image.h" +#include "aom_ports/aom_timer.h" // Macros -#define GET_PARAM(k) std::tr1::get(GetParam()) +#define GET_PARAM(k) ::testing::get(GetParam()) inline double compute_psnr(const aom_image_t *img1, const aom_image_t *img2) { assert((img1->fmt == img2->fmt) && (img1->d_w == img2->d_w) && @@ -44,4 +45,9 @@ inline double compute_psnr(const aom_image_t *img1, const aom_image_t *img2) { return psnr; } +static INLINE double get_time_mark(aom_usec_timer *t) { + aom_usec_timer_mark(t); + return static_cast(aom_usec_timer_elapsed(t)); +} + #endif // TEST_UTIL_H_ -- cgit v1.2.3 From d2499ead93dc4298c0882fe98902acb1b5209f99 Mon Sep 17 00:00:00 2001 From: trav90 Date: Fri, 19 Oct 2018 23:05:00 -0500 Subject: Update libaom to commit ID 1e227d41f0616de9548a673a83a21ef990b62591 --- third_party/aom/test/util.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'third_party/aom/test/util.h') diff --git a/third_party/aom/test/util.h b/third_party/aom/test/util.h index db00875ef..c3f4e4442 100644 --- a/third_party/aom/test/util.h +++ b/third_party/aom/test/util.h @@ -9,8 +9,8 @@ * PATENTS file, you can obtain it at www.aomedia.org/license/patent. */ -#ifndef TEST_UTIL_H_ -#define TEST_UTIL_H_ +#ifndef AOM_TEST_UTIL_H_ +#define AOM_TEST_UTIL_H_ #include #include @@ -50,4 +50,4 @@ static INLINE double get_time_mark(aom_usec_timer *t) { return static_cast(aom_usec_timer_elapsed(t)); } -#endif // TEST_UTIL_H_ +#endif // AOM_TEST_UTIL_H_ -- cgit v1.2.3