Revert av1_set_frame_size arg change for superres
Revert the change to the arguments to the av1_set_frame_size() call for
superres in https://aomedia-review.googlesource.com/c/aom/+/121022.
Passing cm->superres_upscaled_width and cm->superres_upscaled_height to
that av1_set_frame_size() call may cause cm->width and cm->height to be
set to the wrong values for a short period of time under some
conditions.
Bug: aomedia:3336
Change-Id: If6c0554c5318774f42748d80f912d864a8948a61
diff --git a/av1/encoder/encode_strategy.c b/av1/encoder/encode_strategy.c
index 82f55c7..c6656a5 100644
--- a/av1/encoder/encode_strategy.c
+++ b/av1/encoder/encode_strategy.c
@@ -843,8 +843,7 @@
cm->show_frame = frame_params->show_frame;
cm->current_frame.frame_type = frame_params->frame_type;
// TODO(bohanli): Why is this? what part of it is necessary?
- av1_set_frame_size(cpi, cm->superres_upscaled_width,
- cm->superres_upscaled_height);
+ av1_set_frame_size(cpi, cm->width, cm->height);
if (set_mv_params) av1_set_mv_search_params(cpi);
#if CONFIG_RD_COMMAND
