commit c156224a40e2b4867becc0aff958b3c7abd35904
author Tom Finegan <tomfinegan@google.com> Wed May 24 12:08:20 2017 -0700
committer Tom Finegan <tomfinegan@google.com> Thu May 25 16:48:41 2017 +0000
tree 8b1b60f43c578c2c647d7e27a0451b1db417b44f
parent db78450815c668249a0e0e2a6789a2477b93bca7

Support CONFIG_LOOP_RESTORATION in the CMake build.

BUG=aomedia:76

Change-Id: Ifabdedd5e027e1efd87ba8ca1bbf0af06481bb5c

aom_dsp/aom_dsp.cmake

diff --git a/aom_dsp/aom_dsp.cmake b/aom_dsp/aom_dsp.cmake
index 7c53953..f1fd021 100644
--- a/aom_dsp/aom_dsp.cmake
+++ b/aom_dsp/aom_dsp.cmake
@@ -392,6 +392,18 @@
   endif ()
 endif ()
 
+if (CONFIG_LOOP_RESTORATION)
+  set(AOM_DSP_COMMON_INTRIN_SSE2
+      ${AOM_DSP_COMMON_INTRIN_SSE2}
+      "${AOM_ROOT}/aom_dsp/x86/aom_convolve_hip_sse2.c")
+
+  if (CONFIG_HIGHBITDEPTH)
+    set(AOM_DSP_COMMON_INTRIN_SSSE3
+      ${AOM_DSP_COMMON_INTRIN_SSSE3}
+        "${AOM_ROOT}/aom_dsp/x86/aom_highbd_convolve_hip_ssse3.c")
+  endif ()
+endif ()
+
 if (CONFIG_MOTION_VAR)
   set(AOM_DSP_ENCODER_INTRIN_SSE4_1
       ${AOM_DSP_ENCODER_INTRIN_SSE4_1}

av1/av1.cmake

diff --git a/av1/av1.cmake b/av1/av1.cmake
index 3044340..d2124e2 100644
--- a/av1/av1.cmake
+++ b/av1/av1.cmake
@@ -60,7 +60,6 @@
     "${AOM_ROOT}/av1/common/reconintra.h"
     "${AOM_ROOT}/av1/common/resize.c"
     "${AOM_ROOT}/av1/common/resize.h"
-    "${AOM_ROOT}/av1/common/restoration.h"
     "${AOM_ROOT}/av1/common/scale.c"
     "${AOM_ROOT}/av1/common/scale.h"
     "${AOM_ROOT}/av1/common/scan.c"
@@ -339,6 +338,22 @@
     "${AOM_ROOT}/av1/common/cfl.h")
 endif ()
 
+if (CONFIG_LOOP_RESTORATION)
+  set(AOM_AV1_COMMON_SOURCES
+      ${AOM_AV1_COMMON_SOURCES}
+      "${AOM_ROOT}/av1/common/restoration.c"
+      "${AOM_ROOT}/av1/common/restoration.h")
+
+  set(AOM_AV1_COMMON_INTRIN_SSE4_1
+      ${AOM_AV1_COMMON_INTRIN_SSE4_1}
+      "${AOM_ROOT}/av1/common/x86/selfguided_sse4.c")
+
+  set(AOM_AV1_ENCODER_SOURCES
+      ${AOM_AV1_ENCODER_SOURCES}
+      "${AOM_ROOT}/av1/encoder/pickrst.c"
+      "${AOM_ROOT}/av1/encoder/pickrst.h")
+endif ()
+
 if (CONFIG_PVQ)
   set(AOM_AV1_COMMON_SOURCES
       ${AOM_AV1_COMMON_SOURCES}