Remove parameter from av1_loop_restoration_filter_frame

At both callsites, the "rsi" parameter is the rst_info field from cm,
which is already passed.

Change-Id: I837ac655a03ebf0de6fbdaece4f4910f750e4898

av1/common/restoration.c

@@ -1357,7 +1357,7 @@ static void filter_frame_on_unit(const RestorationTileLimits *limits,
 }
 
 void av1_loop_restoration_filter_frame(YV12_BUFFER_CONFIG *frame,
-                                       AV1_COMMON *cm, RestorationInfo *rsi) {
+                                       AV1_COMMON *cm) {
   typedef void (*copy_fun)(const YV12_BUFFER_CONFIG *src,
                            YV12_BUFFER_CONFIG *dst);
   static const copy_fun copy_funs[3] = { aom_yv12_copy_y, aom_yv12_copy_u,
@@ -1388,8 +1388,8 @@ void av1_loop_restoration_filter_frame(YV12_BUFFER_CONFIG *frame,
 #endif
 
   for (int plane = 0; plane < 3; ++plane) {
-    const RestorationInfo *prsi = &rsi[plane];
-    RestorationType rtype = prsi->frame_restoration_type;
+    const RestorationInfo *rsi = &cm->rst_info[plane];
+    RestorationType rtype = rsi->frame_restoration_type;
     if (rtype == RESTORE_NONE) {
       copy_funs[plane](frame, &dst);
       continue;
@@ -1406,7 +1406,7 @@ void av1_loop_restoration_filter_frame(YV12_BUFFER_CONFIG *frame,
                  highbd);
 
     FilterFrameCtxt ctxt;
-    ctxt.rsi = prsi;
+    ctxt.rsi = rsi;
 #if CONFIG_STRIPED_LOOP_RESTORATION
     ctxt.rlbs = &rlbs;
     ctxt.cm = cm;

av1/common/restoration.h

@@ -321,8 +321,7 @@ void av1_loop_restoration_filter_unit(
     uint8_t *dst8, int dst_stride, int32_t *tmpbuf);
 
 void av1_loop_restoration_filter_frame(YV12_BUFFER_CONFIG *frame,
-                                       struct AV1Common *cm,
-                                       RestorationInfo *rsi);
+                                       struct AV1Common *cm);
 void av1_loop_restoration_precal();
 
 typedef void (*rest_unit_visitor_t)(const RestorationTileLimits *limits,

av1/decoder/decodeframe.c

@@ -3691,8 +3691,7 @@ void av1_decode_tg_tiles_and_wrapup(AV1Decoder *pbi, const uint8_t *data,
 #if CONFIG_STRIPED_LOOP_RESTORATION
     av1_loop_restoration_save_boundary_lines(&pbi->cur_buf->buf, cm, 1);
 #endif
-    av1_loop_restoration_filter_frame((YV12_BUFFER_CONFIG *)xd->cur_buf, cm,
-                                      cm->rst_info);
+    av1_loop_restoration_filter_frame((YV12_BUFFER_CONFIG *)xd->cur_buf, cm);
   }
 #endif  // CONFIG_LOOP_RESTORATION
 

av1/encoder/encoder.c

@@ -4766,7 +4766,7 @@ static void loopfilter_frame(AV1_COMP *cpi, AV1_COMMON *cm) {
     if (cm->rst_info[0].frame_restoration_type != RESTORE_NONE ||
         cm->rst_info[1].frame_restoration_type != RESTORE_NONE ||
         cm->rst_info[2].frame_restoration_type != RESTORE_NONE) {
-      av1_loop_restoration_filter_frame(cm->frame_to_show, cm, cm->rst_info);
+      av1_loop_restoration_filter_frame(cm->frame_to_show, cm);
     }
   }
 #endif  // CONFIG_LOOP_RESTORATION