Add option to enable arf + overlay for key frames.
Now --enable-keyframe-filtering accepts parameter value of
2. When --enable-keyframe-filtering=2, keyframes are
filtered, and an overlay frame is added. If
--enable-keyframe-filtering=1 (default), keyframes are
filtered without the overlay.
Change-Id: I0b43a1b8de06cabd09fd43c707bc942541543fd0
diff --git a/apps/aomenc.c b/apps/aomenc.c
index 450489d..581dff9 100644
--- a/apps/aomenc.c
+++ b/apps/aomenc.c
@@ -424,8 +424,9 @@
"This is required for deltaq mode.");
static const arg_def_t enable_keyframe_filtering =
ARG_DEF(NULL, "enable-keyframe-filtering", 1,
- "Apply temporal filtering on key frame "
- "(0: false, 1: true (default)");
+ "Apply temporal filtering on key frame"
+ "(0: no filter, 1: filter without overlay (default),"
+ "2: filter with overlay)");
static const arg_def_t tile_width =
ARG_DEF(NULL, "tile-width", 1, "Tile widths (comma separated)");
static const arg_def_t tile_height =
diff --git a/av1/encoder/encode_strategy.c b/av1/encoder/encode_strategy.c
index 0966093..647ce9f 100644
--- a/av1/encoder/encode_strategy.c
+++ b/av1/encoder/encode_strategy.c
@@ -393,7 +393,19 @@
// buffer. If the current frame is not arf, then pop it. This assumes the
// first frame in the GF group is not arf. May need to change if it is not
// true.
- const int pop_lookahead = (src_index == 0);
+ int pop_lookahead = (src_index == 0);
+ // If this is a key frame and keyframe filtering is enabled with overlay,
+ // then do not pop.
+ if (pop_lookahead && cpi->oxcf.kf_cfg.enable_keyframe_filtering > 1 &&
+ cpi->rc.frames_to_key == 0 && cpi->rc.frames_till_gf_update_due == 0 &&
+ !is_stat_generation_stage(cpi) && cpi->lookahead) {
+ if (cpi->lookahead->read_ctxs[cpi->compressor_stage].sz &&
+ (*flush ||
+ cpi->lookahead->read_ctxs[cpi->compressor_stage].sz ==
+ cpi->lookahead->read_ctxs[cpi->compressor_stage].pop_sz)) {
+ pop_lookahead = 0;
+ }
+ }
frame_params->show_frame = pop_lookahead;
if (pop_lookahead) {
// show frame, pop from buffer
diff --git a/av1/encoder/gop_structure.c b/av1/encoder/gop_structure.c
index 1c3e969..bd03de2 100644
--- a/av1/encoder/gop_structure.c
+++ b/av1/encoder/gop_structure.c
@@ -98,17 +98,32 @@
first_frame_update_type == OVERLAY_UPDATE ||
first_frame_update_type == GF_UPDATE);
- gf_group->update_type[frame_index] = first_frame_update_type;
- gf_group->arf_src_offset[frame_index] = 0;
- gf_group->cur_frame_idx[frame_index] = cur_frame_index;
- gf_group->layer_depth[frame_index] =
- first_frame_update_type == OVERLAY_UPDATE ? MAX_ARF_LAYERS + 1 : 0;
- gf_group->max_layer_depth = 0;
- ++frame_index;
- // TODO(jingning): Increase cur_frame_index when a frame is displayed.
- // When key frame is decomposed into an ARF and overlay frame, increase
- // cur_frame_index after the overlay frame.
- ++cur_frame_index;
+ if (first_frame_update_type == KF_UPDATE &&
+ cpi->oxcf.kf_cfg.enable_keyframe_filtering > 1) {
+ gf_group->update_type[frame_index] = ARF_UPDATE;
+ gf_group->arf_src_offset[frame_index] = 0;
+ gf_group->cur_frame_idx[frame_index] = cur_frame_index;
+ gf_group->layer_depth[frame_index] = 0;
+ gf_group->max_layer_depth = 0;
+ ++frame_index;
+
+ gf_group->update_type[frame_index] = OVERLAY_UPDATE;
+ gf_group->arf_src_offset[frame_index] = 0;
+ gf_group->cur_frame_idx[frame_index] = cur_frame_index;
+ gf_group->layer_depth[frame_index] = 0;
+ gf_group->max_layer_depth = 0;
+ ++frame_index;
+ cur_frame_index++;
+ } else {
+ gf_group->update_type[frame_index] = first_frame_update_type;
+ gf_group->arf_src_offset[frame_index] = 0;
+ gf_group->cur_frame_idx[frame_index] = cur_frame_index;
+ gf_group->layer_depth[frame_index] =
+ first_frame_update_type == OVERLAY_UPDATE ? MAX_ARF_LAYERS + 1 : 0;
+ gf_group->max_layer_depth = 0;
+ ++frame_index;
+ ++cur_frame_index;
+ }
// ALTREF.
const int use_altref = gf_group->max_layer_depth_allowed > 0;
