Move aom source to a sub-directory under media/libaom

There is no damned reason to treat this differently than any other media lib given its license and there never was.

1 files changed, 0 insertions, 53 deletions

diff --git a/third_party/aom/test/util.h b/third_party/aom/test/util.h
deleted file mode 100644
index c3f4e4442..000000000
--- a/third_party/aom/test/util.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * 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 AOM_TEST_UTIL_H_
-#define AOM_TEST_UTIL_H_
-
-#include <stdio.h>
-#include <math.h>
-#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) ::testing::get<k>(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<double>(sqrerr) / (width_y * height_y);
-  double psnr = 100.0;
-  if (mse > 0.0) {
-    psnr = 10 * log10(255.0 * 255.0 / mse);
-  }
-  return psnr;
-}
-
-static INLINE double get_time_mark(aom_usec_timer *t) {
-  aom_usec_timer_mark(t);
-  return static_cast<double>(aom_usec_timer_elapsed(t));
-}
-
-#endif  // AOM_TEST_UTIL_H_