commit 8afb8548a5153dfa5cf6436fa17bc4bf716f6a77
author chiyotsai <chiyotsai@google.com> Wed Mar 04 17:56:58 2020 -0800
committer Chi Yo Tsai <chiyotsai@google.com> Thu Mar 05 19:27:56 2020 +0000
tree 0d5b0b1469ce4bef68709025c984b8ae9cea1dea
parent 2f62d005504b055bb3c0000bf3176024c2b44417

Remove some unused tuning enums

Change-Id: I1bcd0948808638923a6b4f24c8b561a656738e7e

aom/aomcx.h

diff --git a/aom/aomcx.h b/aom/aomcx.h
index 816e000..5034674 100644
--- a/aom/aomcx.h
+++ b/aom/aomcx.h
@@ -1286,8 +1286,8 @@
 typedef enum {
   AOM_TUNE_PSNR,
   AOM_TUNE_SSIM,
-  AOM_TUNE_CDEF_DIST,
-  AOM_TUNE_DAALA_DIST,
+  AOM_TUNE_CDEF_DIST,   // Unused
+  AOM_TUNE_DAALA_DIST,  // Unused
   AOM_TUNE_VMAF_WITH_PREPROCESSING,
   AOM_TUNE_VMAF_WITHOUT_PREPROCESSING,
   AOM_TUNE_VMAF_MAX_GAIN

apps/aomenc.c

diff --git a/apps/aomenc.c b/apps/aomenc.c
index 636816f..a687050 100644
--- a/apps/aomenc.c
+++ b/apps/aomenc.c
@@ -390,10 +390,6 @@
 static const struct arg_enum_list tuning_enum[] = {
   { "psnr", AOM_TUNE_PSNR },
   { "ssim", AOM_TUNE_SSIM },
-#if CONFIG_DIST_8X8
-  { "cdef-dist", AOM_TUNE_CDEF_DIST },
-  { "daala-dist", AOM_TUNE_DAALA_DIST },
-#endif
   { "vmaf_with_preprocessing", AOM_TUNE_VMAF_WITH_PREPROCESSING },
   { "vmaf_without_preprocessing", AOM_TUNE_VMAF_WITHOUT_PREPROCESSING },
   { "vmaf", AOM_TUNE_VMAF_MAX_GAIN },