Remove CONFIG_FWD_KF
This tool is fully adopted.
Change-Id: I2cc07bc02e02219bfa135f097ab1e1adbdd92b4a
diff --git a/av1/common/onyxc_int.h b/av1/common/onyxc_int.h
index fcd4fd9..8272503 100644
--- a/av1/common/onyxc_int.h
+++ b/av1/common/onyxc_int.h
@@ -295,10 +295,7 @@
int show_existing_frame;
// Flag for a frame used as a reference - not written to the bitstream
int is_reference_frame;
-
-#if CONFIG_FWD_KF
int reset_decoder_state;
-#endif // CONFIG_FWD_KF
// Flag signaling that the frame is encoded using only INTRA modes.
uint8_t intra_only;
diff --git a/av1/decoder/decodeframe.c b/av1/decoder/decodeframe.c
index d181dd7..2a66f40 100644
--- a/av1/decoder/decodeframe.c
+++ b/av1/decoder/decodeframe.c
@@ -2464,7 +2464,6 @@
}
#endif
-#if CONFIG_FWD_KF
static void show_existing_frame_reset(AV1Decoder *const pbi,
int existing_frame_idx) {
AV1_COMMON *const cm = &pbi->common;
@@ -2542,7 +2541,6 @@
// Reload the adapted CDFs from when we originally coded this keyframe
*cm->fc = cm->frame_contexts[existing_frame_idx];
}
-#endif // CONFIG_FWD_KF
static int read_uncompressed_header(AV1Decoder *pbi,
struct aom_read_bit_buffer *rb) {
@@ -2563,9 +2561,7 @@
cm->is_reference_frame = 1;
cm->show_existing_frame = aom_rb_read_bit(rb);
-#if CONFIG_FWD_KF
cm->reset_decoder_state = 0;
-#endif // CONFIG_FWD_KF
if (cm->show_existing_frame) {
// Show an existing frame directly.
@@ -2589,9 +2585,7 @@
frame_to_show);
}
ref_cnt_fb(frame_bufs, &cm->new_fb_idx, frame_to_show);
-#if CONFIG_FWD_KF
cm->reset_decoder_state = frame_bufs[frame_to_show].frame_type == KEY_FRAME;
-#endif // CONFIG_FWD_KF
unlock_buffer_pool(pool);
cm->lf.filter_level[0] = 0;
@@ -2612,15 +2606,11 @@
#endif
#endif
-#if CONFIG_FWD_KF
if (cm->reset_decoder_state) {
show_existing_frame_reset(pbi, existing_frame_idx);
} else {
-#endif // CONFIG_FWD_KF
pbi->refresh_frame_flags = 0;
-#if CONFIG_FWD_KF
}
-#endif // CONFIG_FWD_KF
return 0;
}
@@ -2724,12 +2714,10 @@
if (cm->frame_type == KEY_FRAME) {
#if !CONFIG_EXPLICIT_ORDER_HINT
wrap_around_current_video_frame(pbi);
-#endif // !CONFIG_EXPLICIT_ORDER_HINT
-#if CONFIG_FWD_KF
+#endif // !CONFIG_EXPLICIT_ORDER_HINT
if (!cm->show_frame) // unshown keyframe (forward keyframe)
pbi->refresh_frame_flags = aom_rb_read_literal(rb, REF_FRAMES);
else // shown keyframe
-#endif // CONFIG_FWD_KF
pbi->refresh_frame_flags = (1 << REF_FRAMES) - 1;
for (int i = 0; i < INTER_REFS_PER_FRAME; ++i) {
@@ -3298,7 +3286,6 @@
#else
*p_data_end = data + aom_rb_bytes_read(&rb);
#endif
-#if CONFIG_FWD_KF
if (cm->reset_decoder_state) {
// Use the default frame context values.
*cm->fc = cm->frame_contexts[FRAME_CONTEXT_DEFAULTS];
@@ -3307,7 +3294,6 @@
aom_internal_error(&cm->error, AOM_CODEC_CORRUPT_FRAME,
"Uninitialized entropy context.");
}
-#endif // CONFIG_FWD_KF
return 0;
}
diff --git a/av1/decoder/decoder.c b/av1/decoder/decoder.c
index b0245b9..65c0640 100644
--- a/av1/decoder/decoder.c
+++ b/av1/decoder/decoder.c
@@ -224,13 +224,9 @@
++ref_index;
}
-// Current thread releases the holding of reference frame.
-#if CONFIG_FWD_KF
+ // Current thread releases the holding of reference frame.
const int check_on_show_existing_frame =
!cm->show_existing_frame || cm->reset_decoder_state;
-#else
- const int check_on_show_existing_frame = !cm->show_existing_frame;
-#endif // CONFIG_FWD_KF
for (; ref_index < REF_FRAMES && check_on_show_existing_frame; ++ref_index) {
const int old_idx = cm->ref_frame_map[ref_index];
decrease_ref_count(old_idx, frame_bufs, pool);
@@ -326,13 +322,9 @@
++ref_index;
}
-// Current thread releases the holding of reference frame.
-#if CONFIG_FWD_KF
+ // Current thread releases the holding of reference frame.
const int check_on_show_existing_frame =
!cm->show_existing_frame || cm->reset_decoder_state;
-#else
- const int check_on_show_existing_frame = !cm->show_existing_frame;
-#endif // CONFIG_FWD_KF
for (; ref_index < REF_FRAMES && check_on_show_existing_frame;
++ref_index) {
const int old_idx = cm->ref_frame_map[ref_index];
diff --git a/av1/encoder/bitstream.c b/av1/encoder/bitstream.c
index 9ddfbc2..e479bbc 100644
--- a/av1/encoder/bitstream.c
+++ b/av1/encoder/bitstream.c
@@ -2938,14 +2938,12 @@
}
#endif
-#if CONFIG_FWD_KF
if (cm->reset_decoder_state &&
frame_bufs[frame_to_show].frame_type != KEY_FRAME) {
aom_internal_error(
&cm->error, AOM_CODEC_UNSUP_BITSTREAM,
"show_existing_frame to reset state on KEY_FRAME only");
}
-#endif // CONFIG_FWD_KF
return;
} else {
diff --git a/av1/encoder/encoder.c b/av1/encoder/encoder.c
index 52d8a59..318bf85 100644
--- a/av1/encoder/encoder.c
+++ b/av1/encoder/encoder.c
@@ -5719,11 +5719,9 @@
cpi->refresh_alt2_ref_frame = 0;
cpi->refresh_alt_ref_frame = 0;
-#if CONFIG_FWD_KF
// TODO(zoeliu@gmail.com): To support forward-KEY_FRAME and set up the
// following flag accordingly.
cm->reset_decoder_state = 0;
-#endif // CONFIG_FWD_KF
if (oxcf->pass == 2 && cm->show_existing_frame) {
// Manage the source buffer and flush out the source frame that has been
diff --git a/build/cmake/aom_config_defaults.cmake b/build/cmake/aom_config_defaults.cmake
index f7fa86c..b497aee 100644
--- a/build/cmake/aom_config_defaults.cmake
+++ b/build/cmake/aom_config_defaults.cmake
@@ -99,7 +99,6 @@
set(CONFIG_FP_MB_STATS 0 CACHE NUMBER "AV1 experiment flag.")
set(CONFIG_FRAME_COUNTER_FOR_SCALABILITY 0 CACHE NUMBER "AV1 experiment flag.")
set(CONFIG_FRAME_REFS_SIGNALING 1 CACHE NUMBER "AV1 experiment flag.")
-set(CONFIG_FWD_KF 1 CACHE NUMBER "AV1 experiment flag.")
set(CONFIG_HASH_ME 0 CACHE NUMBER "AV1 experiment flag.")
set(CONFIG_INTER_STATS_ONLY 0 CACHE NUMBER "AV1 experiment flag.")
set(CONFIG_LOWPRECISION_BLEND 1 CACHE NUMBER "AV1 experiment flag.")
