diff --git a/build/cmake/aom_config.asm.cmake b/build/cmake/aom_config.asm.cmake index a538c197d5aeeb9730996c14d3d822b19f3a7488..89595165cb0df2375f76213a56a77f78e0b79067 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 49c1d78c6793b018a186a0a7e31f686ae6bb7f63..301cd264a6fe6d521947f02f528eb0f7a712b79e 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 b1d2828f95833854e28a5cbf8d191b3baf2203fc..279f8c2d1613c1ba020c1739fcb27d1dd7d89e3b 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 837b478ec4195374b546e8b16f28ff069fefcdba..71c3d472c9cb997762112261f1dcfec0d1355f3d 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 6785a9bb85528e5104643728a0580f67176c3757..4560836b4a7817f12d90a2ea392031329e3122c6 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 6f3523f0ba639fda4dbaff80ba50a1c4083dc12d..25e21422776f4e927d4c047dda40fc0c8e90c12a 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 ed51b6fa896ae0b6cede8e2318fb178d05dc1a12..03719eda06dbb50a8d4b937483bee2a9de3da1ee 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