commit 7166f22ac2de958b189dde0a45c02628155f1237
author Debargha Mukherjee <debargha@google.com> Tue Sep 05 21:32:42 2017 -0700
committer Debargha Mukherjee <debargha@google.com> Sat Sep 16 00:48:57 2017 +0000
tree 41495e5182dc63eb398d051f424b6c68791d5bbb
parent 34e1201ad5a5154fde772ddbe37d32d985c559b8

Add a q index based frame superres mode

Refactors and adds superres-mode 3 and associated
paramters --superres-qthresh and --superres-kf-qthresh
that are used to trigger superres mode when the qindex
for any frame exceeds the thresholds provided for non-key
and key-frames respenctively. The superres scale factor
numerator is progressively reduced from 16 starting from
that q threshold following a fixed slope.

Change-Id: If1c782993667a6fbaaa01bbde77c4924008c0d28

aomenc.c

diff --git a/aomenc.c b/aomenc.c
index d9e1f73..fd334fa 100644
--- a/aomenc.c
+++ b/aomenc.c
@@ -302,6 +302,11 @@
 static const arg_def_t superres_kf_numerator =
     ARG_DEF(NULL, "superres-kf-numerator", 1,
             "Frame super-resolution keyframe numerator");
+static const arg_def_t superres_qthresh = ARG_DEF(
+    NULL, "superres-qthresh", 1, "Frame super-resolution qindex threshold");
+static const arg_def_t superres_kf_qthresh =
+    ARG_DEF(NULL, "superres-kf-qthresh", 1,
+            "Frame super-resolution keyframe qindex threshold");
 #endif  // CONFIG_FRAME_SUPERRES
 static const struct arg_enum_list end_usage_enum[] = { { "vbr", AOM_VBR },
                                                        { "cbr", AOM_CBR },
@@ -334,6 +339,8 @@
                                       &superres_mode,
                                       &superres_numerator,
                                       &superres_kf_numerator,
+                                      &superres_qthresh,
+                                      &superres_kf_qthresh,
 #endif  // CONFIG_FRAME_SUPERRES
                                       &end_usage,
                                       &target_bitrate,
@@ -1055,6 +1062,10 @@
       config->cfg.rc_superres_numerator = arg_parse_uint(&arg);
     } else if (arg_match(&arg, &superres_kf_numerator, argi)) {
       config->cfg.rc_superres_kf_numerator = arg_parse_uint(&arg);
+    } else if (arg_match(&arg, &superres_qthresh, argi)) {
+      config->cfg.rc_superres_qthresh = arg_parse_uint(&arg);
+    } else if (arg_match(&arg, &superres_kf_qthresh, argi)) {
+      config->cfg.rc_superres_kf_qthresh = arg_parse_uint(&arg);
 #endif  // CONFIG_FRAME_SUPERRES
     } else if (arg_match(&arg, &end_usage, argi)) {
       config->cfg.rc_end_usage = arg_parse_enum_or_int(&arg);
@@ -1267,6 +1278,8 @@
   SHOW(rc_superres_mode);
   SHOW(rc_superres_numerator);
   SHOW(rc_superres_kf_numerator);
+  SHOW(rc_superres_qthresh);
+  SHOW(rc_superres_kf_qthresh);
 #endif  // CONFIG_FRAME_SUPERRES
   SHOW(rc_end_usage);
   SHOW(rc_target_bitrate);