Some cleanups on the loopfilter state patch.
With the bug fix in https://aomedia-review.googlesource.com/c/aom/+/52383
the encoder side workaround to get the test
AV1/AVxEncoderThreadLSTest.EncoderResultTest/* to pass is no longer
necessary.
Also removes some unnecessary lines on the decoder side.
Change-Id: I91c6ba088fa02be4d7b6d80657dabc0497ccde27
diff --git a/av1/decoder/decodeframe.c b/av1/decoder/decodeframe.c
index 7df756c..d181dd7 100644
--- a/av1/decoder/decodeframe.c
+++ b/av1/decoder/decodeframe.c
@@ -1103,11 +1103,8 @@
struct loopfilter *lf = &cm->lf;
if ((cm->allow_intrabc && NO_FILTER_FOR_IBC) || cm->all_lossless) {
// write default deltas to frame buffer
- av1_set_default_ref_deltas(lf->ref_deltas);
- av1_set_default_mode_deltas(lf->mode_deltas);
av1_set_default_ref_deltas(cm->cur_frame->ref_deltas);
av1_set_default_mode_deltas(cm->cur_frame->mode_deltas);
- lf->sharpness_level = -1;
return;
}
assert(!cm->all_lossless);
diff --git a/av1/encoder/encodeframe.c b/av1/encoder/encodeframe.c
index 69c58a1..9d0372a 100644
--- a/av1/encoder/encodeframe.c
+++ b/av1/encoder/encodeframe.c
@@ -4225,13 +4225,9 @@
if ((cm->allow_intrabc && NO_FILTER_FOR_IBC) || cm->all_lossless) {
av1_set_default_ref_deltas(cm->lf.ref_deltas);
av1_set_default_mode_deltas(cm->lf.mode_deltas);
- cm->lf.mode_ref_delta_update = 1;
} else if (cm->prev_frame) {
memcpy(cm->lf.ref_deltas, cm->prev_frame->ref_deltas, TOTAL_REFS_PER_FRAME);
memcpy(cm->lf.mode_deltas, cm->prev_frame->mode_deltas, MAX_MODE_LF_DELTAS);
- cm->lf.mode_ref_delta_update = 1;
- } else {
- cm->lf.mode_ref_delta_update = 0;
}
memcpy(cm->cur_frame->ref_deltas, cm->lf.ref_deltas, TOTAL_REFS_PER_FRAME);
memcpy(cm->cur_frame->mode_deltas, cm->lf.mode_deltas, MAX_MODE_LF_DELTAS);