From 58833e604637e2a3fb852f7fb4029caf86873b9f Mon Sep 17 00:00:00 2001 From: Tom Finegan Date: Mon, 6 Mar 2017 14:01:29 -0800 Subject: [PATCH] Remove the multi_res_encoding flag support from build system. Does nothing; clean up patch. Change-Id: Ic96f9a70dc2d947b406cd50cd00878ce8b2c1ca0 --- build/cmake/aom_config.asm.cmake | 1 - build/cmake/aom_config.h.cmake | 1 - build/cmake/aom_config_defaults.cmake | 1 - build/cmake/targets/rtcd_templates/generic.rtcd.cmake | 1 - build/cmake/targets/rtcd_templates/x86.rtcd.cmake | 1 - build/cmake/targets/rtcd_templates/x86_64.rtcd.cmake | 1 - configure | 3 --- 7 files changed, 9 deletions(-) diff --git a/build/cmake/aom_config.asm.cmake b/build/cmake/aom_config.asm.cmake index a538c197d..89595165c 100644 --- a/build/cmake/aom_config.asm.cmake +++ b/build/cmake/aom_config.asm.cmake @@ -63,7 +63,6 @@ CONFIG_LIBYUV equ ${CONFIG_LIBYUV} CONFIG_ACCOUNTING equ ${CONFIG_ACCOUNTING} CONFIG_DECODE_PERF_TESTS equ ${CONFIG_DECODE_PERF_TESTS} CONFIG_ENCODE_PERF_TESTS equ ${CONFIG_ENCODE_PERF_TESTS} -CONFIG_MULTI_RES_ENCODING equ ${CONFIG_MULTI_RES_ENCODING} CONFIG_TEMPORAL_DENOISING equ ${CONFIG_TEMPORAL_DENOISING} CONFIG_AV1_TEMPORAL_DENOISING equ ${CONFIG_AV1_TEMPORAL_DENOISING} CONFIG_COEFFICIENT_RANGE_CHECKING equ ${CONFIG_COEFFICIENT_RANGE_CHECKING} diff --git a/build/cmake/aom_config.h.cmake b/build/cmake/aom_config.h.cmake index 49c1d78c6..301cd264a 100644 --- a/build/cmake/aom_config.h.cmake +++ b/build/cmake/aom_config.h.cmake @@ -80,7 +80,6 @@ #define CONFIG_ACCOUNTING ${CONFIG_ACCOUNTING} #define CONFIG_DECODE_PERF_TESTS ${CONFIG_DECODE_PERF_TESTS} #define CONFIG_ENCODE_PERF_TESTS ${CONFIG_ENCODE_PERF_TESTS} -#define CONFIG_MULTI_RES_ENCODING ${CONFIG_MULTI_RES_ENCODING} #define CONFIG_TEMPORAL_DENOISING ${CONFIG_TEMPORAL_DENOISING} #define CONFIG_AV1_TEMPORAL_DENOISING ${CONFIG_AV1_TEMPORAL_DENOISING} #define CONFIG_COEFFICIENT_RANGE_CHECKING ${CONFIG_COEFFICIENT_RANGE_CHECKING} diff --git a/build/cmake/aom_config_defaults.cmake b/build/cmake/aom_config_defaults.cmake index b1d2828f9..279f8c2d1 100644 --- a/build/cmake/aom_config_defaults.cmake +++ b/build/cmake/aom_config_defaults.cmake @@ -80,7 +80,6 @@ set(CONFIG_LIBYUV 1 CACHE BOOL "Enables libyuv scaling and conversion support.") set(CONFIG_ACCOUNTING 0 CACHE BOOL "Internal flag.") set(CONFIG_DECODE_PERF_TESTS 0 CACHE BOOL "Internal flag.") set(CONFIG_ENCODE_PERF_TESTS 0 CACHE BOOL "Internal flag.") -set(CONFIG_MULTI_RES_ENCODING 0 CACHE BOOL "Internal flag.") set(CONFIG_TEMPORAL_DENOISING 1 CACHE BOOL "Internal flag.") set(CONFIG_AV1_TEMPORAL_DENOISING 0 CACHE BOOL "Internal flag.") set(CONFIG_COEFFICIENT_RANGE_CHECKING 0 CACHE BOOL "Internal flag.") diff --git a/build/cmake/targets/rtcd_templates/generic.rtcd.cmake b/build/cmake/targets/rtcd_templates/generic.rtcd.cmake index 837b478ec..71c3d472c 100644 --- a/build/cmake/targets/rtcd_templates/generic.rtcd.cmake +++ b/build/cmake/targets/rtcd_templates/generic.rtcd.cmake @@ -79,7 +79,6 @@ CONFIG_MASKED_TX=${RTCD_CONFIG_MASKED_TX} CONFIG_MOTION_VAR=${RTCD_CONFIG_MOTION_VAR} CONFIG_MSVS=${RTCD_CONFIG_MSVS} CONFIG_MULTITHREAD=${RTCD_CONFIG_MULTITHREAD} -CONFIG_MULTI_RES_ENCODING=${RTCD_CONFIG_MULTI_RES_ENCODING} CONFIG_MV_COMPRESS=${RTCD_CONFIG_MV_COMPRESS} CONFIG_NCOBMC=${RTCD_CONFIG_NCOBMC} CONFIG_NEW_QUANT=${RTCD_CONFIG_NEW_QUANT} diff --git a/build/cmake/targets/rtcd_templates/x86.rtcd.cmake b/build/cmake/targets/rtcd_templates/x86.rtcd.cmake index 6785a9bb8..4560836b4 100644 --- a/build/cmake/targets/rtcd_templates/x86.rtcd.cmake +++ b/build/cmake/targets/rtcd_templates/x86.rtcd.cmake @@ -89,7 +89,6 @@ CONFIG_MASKED_TX=${RTCD_CONFIG_MASKED_TX} CONFIG_MOTION_VAR=${RTCD_CONFIG_MOTION_VAR} CONFIG_MSVS=${RTCD_CONFIG_MSVS} CONFIG_MULTITHREAD=${RTCD_CONFIG_MULTITHREAD} -CONFIG_MULTI_RES_ENCODING=${RTCD_CONFIG_MULTI_RES_ENCODING} CONFIG_MV_COMPRESS=${RTCD_CONFIG_MV_COMPRESS} CONFIG_NCOBMC=${RTCD_CONFIG_NCOBMC} CONFIG_NEW_QUANT=${RTCD_CONFIG_NEW_QUANT} diff --git a/build/cmake/targets/rtcd_templates/x86_64.rtcd.cmake b/build/cmake/targets/rtcd_templates/x86_64.rtcd.cmake index 6f3523f0b..25e214227 100644 --- a/build/cmake/targets/rtcd_templates/x86_64.rtcd.cmake +++ b/build/cmake/targets/rtcd_templates/x86_64.rtcd.cmake @@ -89,7 +89,6 @@ CONFIG_MASKED_TX=${RTCD_CONFIG_MASKED_TX} CONFIG_MOTION_VAR=${RTCD_CONFIG_MOTION_VAR} CONFIG_MSVS=${RTCD_CONFIG_MSVS} CONFIG_MULTITHREAD=${RTCD_CONFIG_MULTITHREAD} -CONFIG_MULTI_RES_ENCODING=${RTCD_CONFIG_MULTI_RES_ENCODING} CONFIG_MV_COMPRESS=${RTCD_CONFIG_MV_COMPRESS} CONFIG_NCOBMC=${RTCD_CONFIG_NCOBMC} CONFIG_NEW_QUANT=${RTCD_CONFIG_NEW_QUANT} diff --git a/configure b/configure index ed51b6fa8..03719eda0 100755 --- a/configure +++ b/configure @@ -53,7 +53,6 @@ Advanced options: ${toggle_static} static library support ${toggle_small} favor smaller size over speed ${toggle_postproc_visualizer} macro block / block level visualizers - ${toggle_multi_res_encoding} enable multiple-resolution encoding ${toggle_temporal_denoising} enable temporal denoising and disable the spatial denoiser ${toggle_av1_temporal_denoising} enable av1 temporal denoising @@ -358,7 +357,6 @@ CONFIG_LIST=" inspection decode_perf_tests encode_perf_tests - multi_res_encoding temporal_denoising av1_temporal_denoising coefficient_range_checking @@ -418,7 +416,6 @@ CMDLINE_SELECT=" inspection decode_perf_tests encode_perf_tests - multi_res_encoding temporal_denoising av1_temporal_denoising coefficient_range_checking -- GitLab