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, 191 deletions

diff --git a/third_party/aom/av1/common/x86/highbd_convolve_2d_sse2.c b/third_party/aom/av1/common/x86/highbd_convolve_2d_sse2.c
deleted file mode 100644
index 15f8872c1..000000000
--- a/third_party/aom/av1/common/x86/highbd_convolve_2d_sse2.c
+++ /dev/null
@@ -1,191 +0,0 @@
-/*
- * Copyright (c) 2018, 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.
- */
-#include <emmintrin.h>
-#include <assert.h>
-
-#include "config/aom_dsp_rtcd.h"
-
-#include "aom_dsp/aom_filter.h"
-
-static INLINE void copy_64(const uint16_t *src, uint16_t *dst) {
-  __m128i s[8];
-  s[0] = _mm_loadu_si128((__m128i *)(src + 0 * 8));
-  s[1] = _mm_loadu_si128((__m128i *)(src + 1 * 8));
-  s[2] = _mm_loadu_si128((__m128i *)(src + 2 * 8));
-  s[3] = _mm_loadu_si128((__m128i *)(src + 3 * 8));
-  s[4] = _mm_loadu_si128((__m128i *)(src + 4 * 8));
-  s[5] = _mm_loadu_si128((__m128i *)(src + 5 * 8));
-  s[6] = _mm_loadu_si128((__m128i *)(src + 6 * 8));
-  s[7] = _mm_loadu_si128((__m128i *)(src + 7 * 8));
-  _mm_store_si128((__m128i *)(dst + 0 * 8), s[0]);
-  _mm_store_si128((__m128i *)(dst + 1 * 8), s[1]);
-  _mm_store_si128((__m128i *)(dst + 2 * 8), s[2]);
-  _mm_store_si128((__m128i *)(dst + 3 * 8), s[3]);
-  _mm_store_si128((__m128i *)(dst + 4 * 8), s[4]);
-  _mm_store_si128((__m128i *)(dst + 5 * 8), s[5]);
-  _mm_store_si128((__m128i *)(dst + 6 * 8), s[6]);
-  _mm_store_si128((__m128i *)(dst + 7 * 8), s[7]);
-}
-
-static INLINE void copy_128(const uint16_t *src, uint16_t *dst) {
-  __m128i s[16];
-  s[0] = _mm_loadu_si128((__m128i *)(src + 0 * 8));
-  s[1] = _mm_loadu_si128((__m128i *)(src + 1 * 8));
-  s[2] = _mm_loadu_si128((__m128i *)(src + 2 * 8));
-  s[3] = _mm_loadu_si128((__m128i *)(src + 3 * 8));
-  s[4] = _mm_loadu_si128((__m128i *)(src + 4 * 8));
-  s[5] = _mm_loadu_si128((__m128i *)(src + 5 * 8));
-  s[6] = _mm_loadu_si128((__m128i *)(src + 6 * 8));
-  s[7] = _mm_loadu_si128((__m128i *)(src + 7 * 8));
-  s[8] = _mm_loadu_si128((__m128i *)(src + 8 * 8));
-  s[9] = _mm_loadu_si128((__m128i *)(src + 9 * 8));
-  s[10] = _mm_loadu_si128((__m128i *)(src + 10 * 8));
-  s[11] = _mm_loadu_si128((__m128i *)(src + 11 * 8));
-  s[12] = _mm_loadu_si128((__m128i *)(src + 12 * 8));
-  s[13] = _mm_loadu_si128((__m128i *)(src + 13 * 8));
-  s[14] = _mm_loadu_si128((__m128i *)(src + 14 * 8));
-  s[15] = _mm_loadu_si128((__m128i *)(src + 15 * 8));
-  _mm_store_si128((__m128i *)(dst + 0 * 8), s[0]);
-  _mm_store_si128((__m128i *)(dst + 1 * 8), s[1]);
-  _mm_store_si128((__m128i *)(dst + 2 * 8), s[2]);
-  _mm_store_si128((__m128i *)(dst + 3 * 8), s[3]);
-  _mm_store_si128((__m128i *)(dst + 4 * 8), s[4]);
-  _mm_store_si128((__m128i *)(dst + 5 * 8), s[5]);
-  _mm_store_si128((__m128i *)(dst + 6 * 8), s[6]);
-  _mm_store_si128((__m128i *)(dst + 7 * 8), s[7]);
-  _mm_store_si128((__m128i *)(dst + 8 * 8), s[8]);
-  _mm_store_si128((__m128i *)(dst + 9 * 8), s[9]);
-  _mm_store_si128((__m128i *)(dst + 10 * 8), s[10]);
-  _mm_store_si128((__m128i *)(dst + 11 * 8), s[11]);
-  _mm_store_si128((__m128i *)(dst + 12 * 8), s[12]);
-  _mm_store_si128((__m128i *)(dst + 13 * 8), s[13]);
-  _mm_store_si128((__m128i *)(dst + 14 * 8), s[14]);
-  _mm_store_si128((__m128i *)(dst + 15 * 8), s[15]);
-}
-
-void av1_highbd_convolve_2d_copy_sr_sse2(
-    const uint16_t *src, int src_stride, uint16_t *dst, int dst_stride, int w,
-    int h, const InterpFilterParams *filter_params_x,
-    const InterpFilterParams *filter_params_y, const int subpel_x_q4,
-    const int subpel_y_q4, ConvolveParams *conv_params, int bd) {
-  (void)filter_params_x;
-  (void)filter_params_y;
-  (void)subpel_x_q4;
-  (void)subpel_y_q4;
-  (void)conv_params;
-  (void)bd;
-  if (w >= 16) {
-    assert(!((intptr_t)dst % 16));
-    assert(!(dst_stride % 16));
-  }
-
-  if (w == 2) {
-    do {
-      __m128i s = _mm_loadl_epi64((__m128i *)src);
-      *(uint32_t *)dst = _mm_cvtsi128_si32(s);
-      src += src_stride;
-      dst += dst_stride;
-      s = _mm_loadl_epi64((__m128i *)src);
-      *(uint32_t *)dst = _mm_cvtsi128_si32(s);
-      src += src_stride;
-      dst += dst_stride;
-      h -= 2;
-    } while (h);
-  } else if (w == 4) {
-    do {
-      __m128i s[2];
-      s[0] = _mm_loadl_epi64((__m128i *)src);
-      src += src_stride;
-      s[1] = _mm_loadl_epi64((__m128i *)src);
-      src += src_stride;
-      _mm_storel_epi64((__m128i *)dst, s[0]);
-      dst += dst_stride;
-      _mm_storel_epi64((__m128i *)dst, s[1]);
-      dst += dst_stride;
-      h -= 2;
-    } while (h);
-  } else if (w == 8) {
-    do {
-      __m128i s[2];
-      s[0] = _mm_loadu_si128((__m128i *)src);
-      src += src_stride;
-      s[1] = _mm_loadu_si128((__m128i *)src);
-      src += src_stride;
-      _mm_store_si128((__m128i *)dst, s[0]);
-      dst += dst_stride;
-      _mm_store_si128((__m128i *)dst, s[1]);
-      dst += dst_stride;
-      h -= 2;
-    } while (h);
-  } else if (w == 16) {
-    do {
-      __m128i s[4];
-      s[0] = _mm_loadu_si128((__m128i *)(src + 0 * 8));
-      s[1] = _mm_loadu_si128((__m128i *)(src + 1 * 8));
-      src += src_stride;
-      s[2] = _mm_loadu_si128((__m128i *)(src + 0 * 8));
-      s[3] = _mm_loadu_si128((__m128i *)(src + 1 * 8));
-      src += src_stride;
-      _mm_store_si128((__m128i *)(dst + 0 * 8), s[0]);
-      _mm_store_si128((__m128i *)(dst + 1 * 8), s[1]);
-      dst += dst_stride;
-      _mm_store_si128((__m128i *)(dst + 0 * 8), s[2]);
-      _mm_store_si128((__m128i *)(dst + 1 * 8), s[3]);
-      dst += dst_stride;
-      h -= 2;
-    } while (h);
-  } else if (w == 32) {
-    do {
-      __m128i s[8];
-      s[0] = _mm_loadu_si128((__m128i *)(src + 0 * 8));
-      s[1] = _mm_loadu_si128((__m128i *)(src + 1 * 8));
-      s[2] = _mm_loadu_si128((__m128i *)(src + 2 * 8));
-      s[3] = _mm_loadu_si128((__m128i *)(src + 3 * 8));
-      src += src_stride;
-      s[4] = _mm_loadu_si128((__m128i *)(src + 0 * 8));
-      s[5] = _mm_loadu_si128((__m128i *)(src + 1 * 8));
-      s[6] = _mm_loadu_si128((__m128i *)(src + 2 * 8));
-      s[7] = _mm_loadu_si128((__m128i *)(src + 3 * 8));
-      src += src_stride;
-      _mm_store_si128((__m128i *)(dst + 0 * 8), s[0]);
-      _mm_store_si128((__m128i *)(dst + 1 * 8), s[1]);
-      _mm_store_si128((__m128i *)(dst + 2 * 8), s[2]);
-      _mm_store_si128((__m128i *)(dst + 3 * 8), s[3]);
-      dst += dst_stride;
-      _mm_store_si128((__m128i *)(dst + 0 * 8), s[4]);
-      _mm_store_si128((__m128i *)(dst + 1 * 8), s[5]);
-      _mm_store_si128((__m128i *)(dst + 2 * 8), s[6]);
-      _mm_store_si128((__m128i *)(dst + 3 * 8), s[7]);
-      dst += dst_stride;
-      h -= 2;
-    } while (h);
-  } else if (w == 64) {
-    do {
-      copy_64(src, dst);
-      src += src_stride;
-      dst += dst_stride;
-      copy_64(src, dst);
-      src += src_stride;
-      dst += dst_stride;
-      h -= 2;
-    } while (h);
-  } else {
-    do {
-      copy_128(src, dst);
-      src += src_stride;
-      dst += dst_stride;
-      copy_128(src, dst);
-      src += src_stride;
-      dst += dst_stride;
-      h -= 2;
-    } while (h);
-  }
-}