DRAFT: Rebase av2enc first milestone on main

apps/avmenc.c

@@ -147,6 +147,7 @@ const arg_def_t *main_args[] = { &g_av2_codec_arg_defs.help,
                                  &g_av2_codec_arg_defs.skip,
                                  &g_av2_codec_arg_defs.step,
                                  &g_av2_codec_arg_defs.good_dl,
+                                 &g_av2_codec_arg_defs.rt_dl,
                                  &g_av2_codec_arg_defs.quietarg,
                                  &g_av2_codec_arg_defs.verbosearg,
                                  &g_av2_codec_arg_defs.psnrarg,
@@ -303,6 +304,7 @@ const arg_def_t *av2_key_val_args[] = {
   &g_av2_codec_arg_defs.enable_joint_mvd,
   &g_av2_codec_arg_defs.enable_keyframe_filtering,
   &g_av2_codec_arg_defs.enable_lf_sub_pu,
+  &g_av2_codec_arg_defs.enable_low_complexity_decode,
   &g_av2_codec_arg_defs.enable_masked_comp,
   &g_av2_codec_arg_defs.enable_mfh_obu_signaling,
   &g_av2_codec_arg_defs.enable_mhccp,
@@ -631,6 +633,7 @@ static void init_config(cfg_options_t *config) {
   config->scan_type_info_present_flag = 0;
   config->enable_mfh_obu_signaling = 0;
   config->operating_points_count = 1;
+  config->enable_low_complexity_decode = 0;
 }
 
 int read_icc_profile(struct AvxEncoderConfig *global, const char *file) {
@@ -702,6 +705,8 @@ static void parse_global_config(struct AvxEncoderConfig *global, char ***argv) {
       global->usage = arg_parse_uint(&arg);
     } else if (arg_match(&arg, &g_av2_codec_arg_defs.good_dl, argi)) {
       global->usage = AVM_USAGE_GOOD_QUALITY;  // Good quality usage
+    } else if (arg_match(&arg, &g_av2_codec_arg_defs.rt_dl, argi)) {
+      global->usage = AVM_USAGE_REALTIME;  // REALTIME usage
     } else if (arg_match(&arg, &g_av2_codec_arg_defs.use_yv12, argi)) {
       global->color_type = YV12;
     } else if (arg_match(&arg, &g_av2_codec_arg_defs.use_i420, argi)) {

av2/arg_defs.c

@@ -177,6 +177,7 @@ const av2_codec_arg_definitions_t g_av2_codec_arg_defs = {
   .step = ARG_DEF(NULL, "step", 1,
                   "Encode every n-th frame (after the --skip frames)"),
   .good_dl = ARG_DEF(NULL, "good", 0, "Use Good Quality Deadline"),
+  .rt_dl = ARG_DEF(NULL, "rt", 0, "Use Realtime Quality Deadline"),
   .quietarg = ARG_DEF("q", "quiet", 0, "Do not print encode progress"),
   .verbosearg = ARG_DEF("v", "verbose", 0, "Show encoder parameters"),
   .psnrarg = ARG_DEF(
@@ -885,6 +886,10 @@ const av2_codec_arg_definitions_t g_av2_codec_arg_defs = {
   .use_short_metadata = ARG_DEF(NULL, "use-short-metadata", 1,
                                 "Use short metadata OBU format "
                                 "(0: GROUP format [default], 1: SHORT format)"),
+  .enable_low_complexity_decode =
+      ARG_DEF(NULL, "enable-low-complexity-decode", 1,
+              "Enable low complexity decode "
+              "(0: false (default), 1: true)"),
 #endif  // CONFIG_AV2_ENCODER
   .enable_short_refresh_frame_flags =
       ARG_DEF(NULL, "enable-short-refresh-frame-flags", 1,

av2/arg_defs.h

@@ -50,6 +50,7 @@ typedef struct av2_codec_arg_definitions {
   arg_def_t skip;
   arg_def_t step;
   arg_def_t good_dl;
+  arg_def_t rt_dl;
   arg_def_t quietarg;
   arg_def_t verbosearg;
   arg_def_t psnrarg;
@@ -277,6 +278,7 @@ typedef struct av2_codec_arg_definitions {
   arg_def_t dpb_size;
   arg_def_t enable_bru;
   arg_def_t disable_loopfilters_across_tiles;
+  arg_def_t enable_low_complexity_decode;
 #endif  // CONFIG_AV2_ENCODER
   arg_def_t frame_hash_metadata;
   arg_def_t frame_hash_per_plane;

av2/av2.cmake

@@ -252,6 +252,8 @@ list(
   "${AVM_ROOT}/av2/encoder/palette.h"
   "${AVM_ROOT}/av2/encoder/partition_search.h"
   "${AVM_ROOT}/av2/encoder/partition_search.c"
+  "${AVM_ROOT}/av2/encoder/partition_mlp.h"
+  "${AVM_ROOT}/av2/encoder/partition_mlp.c"
   "${AVM_ROOT}/av2/encoder/partition_strategy.h"
   "${AVM_ROOT}/av2/encoder/partition_strategy.c"
   "${AVM_ROOT}/av2/encoder/pass2_strategy.h"
@@ -291,6 +293,9 @@ list(
   "${AVM_ROOT}/av2/encoder/intra_mode_search.c"
   "${AVM_ROOT}/av2/encoder/intra_mode_search.h"
   "${AVM_ROOT}/av2/encoder/intra_mode_search_utils.h"
+  "${AVM_ROOT}/av2/encoder/intra_mode_mlp.c"
+  "${AVM_ROOT}/av2/encoder/intra_mode_mlp.h"
+  "${AVM_ROOT}/av2/encoder/intra_mode_mlp_weights.h"
   "${AVM_ROOT}/av2/encoder/wedge_utils.c"
   "${AVM_ROOT}/av2/encoder/av2_noise_estimate.c"
   "${AVM_ROOT}/av2/encoder/av2_noise_estimate.h"
@@ -396,6 +401,8 @@ list(
   "${AVM_ROOT}/av2/encoder/x86/encodetxb_sse2.c"
   "${AVM_ROOT}/av2/encoder/x86/highbd_block_error_intrin_sse2.c"
   "${AVM_ROOT}/av2/encoder/x86/highbd_temporal_filter_sse2.c"
+  "${AVM_ROOT}/av2/encoder/x86/intra_mode_mlp_sse2.c"
+  "${AVM_ROOT}/av2/encoder/x86/model_rd_sse2.c"
   "${AVM_ROOT}/av2/encoder/x86/wedge_utils_sse2.c")
 
 list(APPEND AVM_AV2_ENCODER_INTRIN_SSE3 "${AVM_ROOT}/av2/encoder/x86/ml_sse3.c")
@@ -418,13 +425,15 @@ list(
   "${AVM_ROOT}/av2/encoder/x86/highbd_fwd_txfm_avx2.c"
   "${AVM_ROOT}/av2/encoder/x86/wedge_utils_avx2.c"
   "${AVM_ROOT}/av2/encoder/x86/encodetxb_avx2.c"
+  "${AVM_ROOT}/av2/encoder/x86/intra_mode_mlp_avx2.c"
   "${AVM_ROOT}/av2/encoder/x86/rdopt_avx2.c"
   "${AVM_ROOT}/av2/encoder/x86/pickrst_avx2.c")
 
 list(
   APPEND
   AVM_AV2_ENCODER_INTRIN_NEON
   "${AVM_ROOT}/av2/encoder/arm/neon/ml_neon.c"
+  "${AVM_ROOT}/av2/encoder/arm/neon/intra_mode_mlp_neon.c"
   "${AVM_ROOT}/av2/encoder/arm/neon/rdopt_neon.c"
   "${AVM_ROOT}/av2/encoder/arm/neon/encodetxb_neon.c"
   "${AVM_ROOT}/av2/encoder/arm/neon/hybrid_fwd_txfm_neon.c")