commit 0115691e3bedec7893eb27761354bae25d28e5b1
author Tom Finegan <tomfinegan@google.com> Fri Feb 03 11:07:23 2017 -0800
committer Tom Finegan <tomfinegan@google.com> Tue Feb 07 08:53:33 2017 -0800
tree 8e4d80b96d95b6de875ae328a0dc88a846b4e82b
parent 633b9539cdda81d9c1bbb311a693284f4659382e

Add CONFIG_INTERNAL_STATS support to the cmake build.

Includes CONFIG_AOM_HIGHBITDEPTH support for same.

BUG=https://bugs.chromium.org/p/aomedia/issues/detail?id=76

Change-Id: I99893c8c3c7e163383f7297d0df777c9c21822fd

CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ab2c8e0..cfa4de5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -613,6 +613,20 @@
 set(AOM_UNIT_TEST_INTRIN_SSSE3 "${AOM_ROOT}/test/simd_cmp_ssse3.cc")
 set(AOM_UNIT_TEST_INTRIN_SSE4_1 "${AOM_ROOT}/test/simd_cmp_sse4.cc")
 
+if (CONFIG_INTERNAL_STATS)
+  set(AOM_DSP_SOURCES
+      ${AOM_DSP_SOURCES}
+      "${AOM_ROOT}/aom_dsp/fastssim.c"
+      "${AOM_ROOT}/aom_dsp/psnr.h"
+      "${AOM_ROOT}/aom_dsp/psnrhvs.c"
+      "${AOM_ROOT}/aom_dsp/ssim.c"
+      "${AOM_ROOT}/aom_dsp/ssim.h")
+
+  set(AOM_AV1_ENCODER_SOURCES
+      ${AOM_AV1_ENCODER_SOURCES}
+      "${AOM_ROOT}/av1/encoder/blockiness.c")
+endif ()
+
 if (CONFIG_AOM_HIGHBITDEPTH)
   set(AOM_DSP_ASM_SSE2
       ${AOM_DSP_ASM_SSE2}
@@ -653,6 +667,12 @@
       "${AOM_ROOT}/av1/encoder/x86/av1_highbd_quantize_sse4.c"
       "${AOM_ROOT}/av1/encoder/x86/highbd_fwd_txfm_sse4.c")
 
+  if (CONFIG_INTERNAL_STATS)
+    set(AOM_UNIT_TEST_SOURCES
+        ${AOM_UNIT_TEST_SOURCES}
+        "${AOM_ROOT}/test/hbd_metrics_test.cc")
+  endif ()
+
   set(AOM_UNIT_TEST_INTRIN_SSE4_1
       ${AOM_UNIT_TEST_INTRIN_SSE4_1}
       "${AOM_ROOT}/test/av1_highbd_iht_test.cc"

build/cmake/targets/generic.cmake

diff --git a/build/cmake/targets/generic.cmake b/build/cmake/targets/generic.cmake
index 6b7adb1..476f2bd 100644
--- a/build/cmake/targets/generic.cmake
+++ b/build/cmake/targets/generic.cmake
@@ -32,3 +32,6 @@
 if (CONFIG_AOM_HIGHBITDEPTH)
   set(RTCD_CONFIG_AOM_HIGHBITDEPTH "yes")
 endif ()
+if (CONFIG_INTERNAL_STATS)
+  set(RTCD_CONFIG_INTERNAL_STATS "yes")
+endif ()

build/cmake/targets/rtcd_templates/generic.rtcd.cmake

diff --git a/build/cmake/targets/rtcd_templates/generic.rtcd.cmake b/build/cmake/targets/rtcd_templates/generic.rtcd.cmake
index 099694a..d5dee09 100644
--- a/build/cmake/targets/rtcd_templates/generic.rtcd.cmake
+++ b/build/cmake/targets/rtcd_templates/generic.rtcd.cmake
@@ -25,3 +25,4 @@
 CONFIG_OS_SUPPORT=${RTCD_CONFIG_OS_SUPPORT}
 CONFIG_TEMPORAL_DENOISING=${RTCD_CONFIG_TEMPORAL_DENOISING}
 CONFIG_AOM_HIGHBITDEPTH=${RTCD_CONFIG_AOM_HIGHBITDEPTH}
+CONFIG_INTERNAL_STATS=${RTCD_CONFIG_INTERNAL_STATS}

build/cmake/targets/rtcd_templates/x86_64.rtcd.cmake

diff --git a/build/cmake/targets/rtcd_templates/x86_64.rtcd.cmake b/build/cmake/targets/rtcd_templates/x86_64.rtcd.cmake
index 9cda3d4..b94288d 100644
--- a/build/cmake/targets/rtcd_templates/x86_64.rtcd.cmake
+++ b/build/cmake/targets/rtcd_templates/x86_64.rtcd.cmake
@@ -34,3 +34,4 @@
 CONFIG_OS_SUPPORT=${RTCD_CONFIG_OS_SUPPORT}
 CONFIG_TEMPORAL_DENOISING=${RTCD_CONFIG_TEMPORAL_DENOISING}
 CONFIG_AOM_HIGHBITDEPTH=${RTCD_CONFIG_AOM_HIGHBITDEPTH}
+CONFIG_INTERNAL_STATS=${RTCD_CONFIG_INTERNAL_STATS}

build/cmake/targets/x86_64.cmake

diff --git a/build/cmake/targets/x86_64.cmake b/build/cmake/targets/x86_64.cmake
index f688fa9..2a1867f 100644
--- a/build/cmake/targets/x86_64.cmake
+++ b/build/cmake/targets/x86_64.cmake
@@ -53,3 +53,6 @@
 if (CONFIG_AOM_HIGHBITDEPTH)
   set(RTCD_CONFIG_AOM_HIGHBITDEPTH "yes")
 endif ()
+if (CONFIG_INTERNAL_STATS)
+  set(RTCD_CONFIG_INTERNAL_STATS "yes")
+endif ()