commit d07f49c30fef5ce1c479fe51f5879af37788da31
author Wan-Teh Chang <wtc@google.com> Tue Mar 24 11:40:16 2020 -0700
committer Wan-Teh Chang <wtc@google.com> Thu Mar 26 02:04:09 2020 +0000
tree 5b5d35157c64ac44a57c0ce6cb2d51fa309dd0ad
parent 9dc909ddd8b9777fae94d0e6742dc6c16e3864b7

Delete AOM_TUNE_CDEF_DIST and AOM_TUNE_DAALA_DIST.

Delete the unused AOM_TUNE_CDEF_DIST and AOM_TUNE_DAALA_DIST
enumerators.

BUG=aomedia:2616

Change-Id: I24c3c1fa9e794daff00487324253d420c6b30fda

aom/aomcx.h

diff --git a/aom/aomcx.h b/aom/aomcx.h
index b785cf7..c42725b 100644
--- a/aom/aomcx.h
+++ b/aom/aomcx.h
@@ -1284,13 +1284,12 @@
  *
  */
 typedef enum {
-  AOM_TUNE_PSNR,
-  AOM_TUNE_SSIM,
-  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
+  AOM_TUNE_PSNR = 0,
+  AOM_TUNE_SSIM = 1,
+  /* NOTE: enums 2 and 3 unused */
+  AOM_TUNE_VMAF_WITH_PREPROCESSING = 4,
+  AOM_TUNE_VMAF_WITHOUT_PREPROCESSING = 5,
+  AOM_TUNE_VMAF_MAX_GAIN = 6
 } aom_tune_metric;
 
 #define AOM_MAX_LAYERS 32   /**< Max number of layers */