Configure all intra mode
Set 1-pass, kf max distance 0, and look ahead buffer 0 in all
intra coding mode.
BUG=aomedia:2959
Change-Id: Iba8c222bb0d27813ce904864dd8cd4099074f7d2
diff --git a/apps/aomenc.c b/apps/aomenc.c
index 78b1690..e6c6889 100644
--- a/apps/aomenc.c
+++ b/apps/aomenc.c
@@ -667,6 +667,11 @@
warn("Enforcing one-pass encoding in realtime mode\n");
global->passes = 1;
}
+
+ if (global->usage == AOM_USAGE_ALL_INTRA && global->passes > 1) {
+ warn("Enforcing one-pass encoding in all intra mode\n");
+ global->passes = 1;
+ }
}
static void open_input_file(struct AvxInputContext *input,
@@ -1048,6 +1053,19 @@
warn("non-zero lag-in-frames option ignored in realtime mode.\n");
config->cfg.g_lag_in_frames = 0;
}
+
+ if (global->usage == AOM_USAGE_ALL_INTRA) {
+ if (config->cfg.g_lag_in_frames != 0) {
+ warn("non-zero lag-in-frames option ignored in all intra mode.\n");
+ config->cfg.g_lag_in_frames = 0;
+ }
+ if (config->cfg.kf_max_dist != 0) {
+ warn(
+ "non-zero max key frame distance option ignored in all intra "
+ "mode.\n");
+ config->cfg.kf_max_dist = 0;
+ }
+ }
return eos_mark_found;
}
diff --git a/av1/av1_cx_iface.c b/av1/av1_cx_iface.c
index 505bb82..6af11ab 100644
--- a/av1/av1_cx_iface.c
+++ b/av1/av1_cx_iface.c
@@ -3449,7 +3449,7 @@
AOM_RC_ONE_PASS, // g_pass
- 19, // g_lag_in_frames
+ 0, // g_lag_in_frames
0, // rc_dropframe_thresh
RESIZE_NONE, // rc_resize_mode
@@ -3462,7 +3462,7 @@
63, // rc_superres_qthresh
32, // rc_superres_kf_qthresh
- AOM_VBR, // rc_end_usage
+ AOM_Q, // rc_end_usage
{ NULL, 0 }, // rc_twopass_stats_in
{ NULL, 0 }, // rc_firstpass_mb_stats_in
256, // rc_target_bandwidth
@@ -3481,9 +3481,9 @@
// keyframing settings (kf)
0, // fwd_kf_enabled
- AOM_KF_AUTO, // kf_mode
+ AOM_KF_DISABLED, // kf_mode
0, // kf_min_dist
- 9999, // kf_max_dist
+ 0, // kf_max_dist
0, // sframe_dist
1, // sframe_mode
0, // large_scale_tile
