shithub: libvpx

Info  •  Files  •  Log  •  Branches

Fix unused parameters in vp9_extend_frame_borders

Change-Id: I7255b3bc47d760333f58ac4878becbcc8ad30967

--- a/vp9/decoder/vp9_decodeframe.c

+++ b/vp9/decoder/vp9_decodeframe.c

@@ -1198,8 +1198,7 @@

                                           ref_buf->buf->y_crop_height,

                                           cm->width, cm->height);

         if (vp9_is_scaled(&ref_buf->sf))

-          vp9_extend_frame_borders(ref_buf->buf,

-                                   cm->subsampling_x, cm->subsampling_y);

+          vp9_extend_frame_borders(ref_buf->buf);

       }

     }

   }

--- a/vp9/encoder/vp9_firstpass.c

+++ b/vp9/encoder/vp9_firstpass.c

@@ -807,7 +807,7 @@

   // Swap frame pointers so last frame refers to the frame we just compressed.

   swap_yv12(lst_yv12, new_yv12);

-  vp9_extend_frame_borders(lst_yv12, cm->subsampling_x, cm->subsampling_y);

+  vp9_extend_frame_borders(lst_yv12);

   // Special case for the first frame. Copy into the GF buffer as a second

   // reference.

--- a/vp9/encoder/vp9_onyx_if.c

+++ b/vp9/encoder/vp9_onyx_if.c

@@ -2674,8 +2674,7 @@

     vp9_loop_filter_frame(cm, xd, lf->filter_level, 0, 0);

   }

-  vp9_extend_frame_inner_borders(cm->frame_to_show,

-                                 cm->subsampling_x, cm->subsampling_y);

+  vp9_extend_frame_inner_borders(cm->frame_to_show);

 }

 static void scale_references(VP9_COMP *cpi) {

@@ -3583,8 +3582,7 @@

         // TODO(agrange) merge these two functions.

         vp9_configure_arnr_filter(cpi, frames_to_arf, cpi->rc.gfu_boost);

         vp9_temporal_filter_prepare(cpi, frames_to_arf);

-        vp9_extend_frame_borders(&cpi->alt_ref_buffer,

-                                 cm->subsampling_x, cm->subsampling_y);

+        vp9_extend_frame_borders(&cpi->alt_ref_buffer);

         force_src_buffer = &cpi->alt_ref_buffer;

       }

@@ -3720,7 +3718,7 @@

                                       cm->width, cm->height);

     if (vp9_is_scaled(&ref_buf->sf))

-      vp9_extend_frame_borders(buf, cm->subsampling_x, cm->subsampling_y);

+      vp9_extend_frame_borders(buf);

   }

   set_ref_ptrs(cm, xd, LAST_FRAME, LAST_FRAME);

--- a/vpx_scale/generic/yv12extend.c

+++ b/vpx_scale/generic/yv12extend.c

@@ -81,9 +81,7 @@

 }

 #if CONFIG_VP9

-static void extend_frame(YV12_BUFFER_CONFIG *const ybf,

-                         int subsampling_x, int subsampling_y,

-                         int ext_size) {

+static void extend_frame(YV12_BUFFER_CONFIG *const ybf, int ext_size) {

   const int c_w = ybf->uv_crop_width;

   const int c_h = ybf->uv_crop_height;

   const int c_ext_size = ext_size >> 1;

@@ -110,16 +108,14 @@

                c_w, c_h, c_et, c_el, c_eb, c_er);

 }

-void vp9_extend_frame_borders_c(YV12_BUFFER_CONFIG *ybf,

-                                int subsampling_x, int subsampling_y) {

-  extend_frame(ybf, subsampling_x, subsampling_y, ybf->border);

+void vp9_extend_frame_borders_c(YV12_BUFFER_CONFIG *ybf) {

+  extend_frame(ybf, ybf->border);

 }

-void vp9_extend_frame_inner_borders_c(YV12_BUFFER_CONFIG *ybf,

-                                      int subsampling_x, int subsampling_y) {

+void vp9_extend_frame_inner_borders_c(YV12_BUFFER_CONFIG *ybf) {

   const int inner_bw = (ybf->border > VP9INNERBORDERINPIXELS) ?

                        VP9INNERBORDERINPIXELS : ybf->border;

-  extend_frame(ybf, subsampling_x, subsampling_y, inner_bw);

+  extend_frame(ybf, inner_bw);

 }

 #endif  // CONFIG_VP9

--- a/vpx_scale/vpx_scale_rtcd.sh

+++ b/vpx_scale/vpx_scale_rtcd.sh

@@ -26,9 +26,9 @@

 specialize vpx_yv12_copy_y neon

 if [ "$CONFIG_VP9" = "yes" ]; then

-    prototype void vp9_extend_frame_borders "struct yv12_buffer_config *ybf, int subsampling_x, int subsampling_y"

+    prototype void vp9_extend_frame_borders "struct yv12_buffer_config *ybf"

     specialize vp9_extend_frame_borders dspr2

-    prototype void vp9_extend_frame_inner_borders "struct yv12_buffer_config *ybf, int subsampling_x, int subsampling_y"

+    prototype void vp9_extend_frame_inner_borders "struct yv12_buffer_config *ybf"

     specialize vp9_extend_frame_inner_borders dspr2

 fi