diff --git a/vp9/decoder/vp9_decodeframe.c b/vp9/decoder/vp9_decodeframe.c index 56b993d5f..d8590fd68 100644 --- a/vp9/decoder/vp9_decodeframe.c +++ b/vp9/decoder/vp9_decodeframe.c @@ -1198,8 +1198,7 @@ static size_t read_uncompressed_header(VP9D_COMP *pbi, 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); } } } diff --git a/vp9/encoder/vp9_firstpass.c b/vp9/encoder/vp9_firstpass.c index 32ed96999..8867899f3 100644 --- a/vp9/encoder/vp9_firstpass.c +++ b/vp9/encoder/vp9_firstpass.c @@ -807,7 +807,7 @@ void vp9_first_pass(VP9_COMP *cpi) { // 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. diff --git a/vp9/encoder/vp9_onyx_if.c b/vp9/encoder/vp9_onyx_if.c index 3921ea8eb..2242cb718 100644 --- a/vp9/encoder/vp9_onyx_if.c +++ b/vp9/encoder/vp9_onyx_if.c @@ -2674,8 +2674,7 @@ static void loopfilter_frame(VP9_COMP *cpi, VP9_COMMON *cm) { 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 @@ int vp9_get_compressed_data(VP9_PTR ptr, unsigned int *frame_flags, // 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 @@ int vp9_get_compressed_data(VP9_PTR ptr, unsigned int *frame_flags, 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); diff --git a/vpx_scale/generic/yv12extend.c b/vpx_scale/generic/yv12extend.c index 7896dfee6..7b43eece2 100644 --- a/vpx_scale/generic/yv12extend.c +++ b/vpx_scale/generic/yv12extend.c @@ -81,9 +81,7 @@ void vp8_yv12_extend_frame_borders_c(YV12_BUFFER_CONFIG *ybf) { } #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 @@ static void extend_frame(YV12_BUFFER_CONFIG *const ybf, 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 diff --git a/vpx_scale/vpx_scale_rtcd.sh b/vpx_scale/vpx_scale_rtcd.sh index 1d02b69d5..c26208c59 100644 --- a/vpx_scale/vpx_scale_rtcd.sh +++ b/vpx_scale/vpx_scale_rtcd.sh @@ -26,9 +26,9 @@ prototype void vpx_yv12_copy_y "const struct yv12_buffer_config *src_ybc, struct 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