Commit 0115691e authored by Tom Finegan's avatar Tom Finegan

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
parent 633b9539
......@@ -613,6 +613,20 @@ set(AOM_UNIT_TEST_INTRIN_SSE2 "${AOM_ROOT}/test/simd_cmp_sse2.cc")
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 @@ if (CONFIG_AOM_HIGHBITDEPTH)
"${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"
......
......@@ -32,3 +32,6 @@ set(RTCD_CONFIG_TEMPORAL_DENOISING "yes")
if (CONFIG_AOM_HIGHBITDEPTH)
set(RTCD_CONFIG_AOM_HIGHBITDEPTH "yes")
endif ()
if (CONFIG_INTERNAL_STATS)
set(RTCD_CONFIG_INTERNAL_STATS "yes")
endif ()
......@@ -25,3 +25,4 @@ CONFIG_STATIC=${RTCD_CONFIG_STATIC}
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}
......@@ -34,3 +34,4 @@ CONFIG_STATIC=${RTCD_CONFIG_STATIC}
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}
......@@ -53,3 +53,6 @@ set(RTCD_CONFIG_TEMPORAL_DENOISING "yes")
if (CONFIG_AOM_HIGHBITDEPTH)
set(RTCD_CONFIG_AOM_HIGHBITDEPTH "yes")
endif ()
if (CONFIG_INTERNAL_STATS)
set(RTCD_CONFIG_INTERNAL_STATS "yes")
endif ()
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment