generic-library/vpx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix unused parameters in vp9_extend_frame_borders

Browse Source 
Change-Id: I7255b3bc47d760333f58ac4878becbcc8ad30967
This commit is contained in:
Yaowu Xu 2014-02-28 15:34:31 -08:00
parent 24c1734f53
commit 0fa4d89042
5 changed files with 12 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
vp9/decoder/vp9_decodeframe.c
View File

@ -1198,8 +1198,7 @@ static size_t read_uncompressed_header(VP9D_COMP *pbi,
ref_buf->buf->y_crop_height, ref_buf->buf->y_crop_height,
cm->width, cm->height); cm->width, cm->height);
if (vp9_is_scaled(&ref_buf->sf)) if (vp9_is_scaled(&ref_buf->sf))
vp9_extend_frame_borders(ref_buf->buf, vp9_extend_frame_borders(ref_buf->buf);
cm->subsampling_x, cm->subsampling_y);
} }
} }
} }

2
vp9/encoder/vp9_firstpass.c
View File

@ -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 frame pointers so last frame refers to the frame we just compressed.
swap_yv12(lst_yv12, new_yv12); 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 // Special case for the first frame. Copy into the GF buffer as a second
// reference. // reference.

8
vp9/encoder/vp9_onyx_if.c
View File

@ -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_loop_filter_frame(cm, xd, lf->filter_level, 0, 0);
} }
vp9_extend_frame_inner_borders(cm->frame_to_show, vp9_extend_frame_inner_borders(cm->frame_to_show);
cm->subsampling_x, cm->subsampling_y);
} }
static void scale_references(VP9_COMP *cpi) { 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. // TODO(agrange) merge these two functions.
vp9_configure_arnr_filter(cpi, frames_to_arf, cpi->rc.gfu_boost); vp9_configure_arnr_filter(cpi, frames_to_arf, cpi->rc.gfu_boost);
vp9_temporal_filter_prepare(cpi, frames_to_arf); vp9_temporal_filter_prepare(cpi, frames_to_arf);
vp9_extend_frame_borders(&cpi->alt_ref_buffer, vp9_extend_frame_borders(&cpi->alt_ref_buffer);
cm->subsampling_x, cm->subsampling_y);
force_src_buffer = &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); cm->width, cm->height);
if (vp9_is_scaled(&ref_buf->sf)) 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); set_ref_ptrs(cm, xd, LAST_FRAME, LAST_FRAME);

14
vpx_scale/generic/yv12extend.c
View File

@ -81,9 +81,7 @@ void vp8_yv12_extend_frame_borders_c(YV12_BUFFER_CONFIG *ybf) {
} }
#if CONFIG_VP9 #if CONFIG_VP9
static void extend_frame(YV12_BUFFER_CONFIG *const ybf, static void extend_frame(YV12_BUFFER_CONFIG *const ybf, int ext_size) {
int subsampling_x, int subsampling_y,
int ext_size) {
const int c_w = ybf->uv_crop_width; const int c_w = ybf->uv_crop_width;
const int c_h = ybf->uv_crop_height; const int c_h = ybf->uv_crop_height;
const int c_ext_size = ext_size >> 1; 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); c_w, c_h, c_et, c_el, c_eb, c_er);
} }
void vp9_extend_frame_borders_c(YV12_BUFFER_CONFIG *ybf, void vp9_extend_frame_borders_c(YV12_BUFFER_CONFIG *ybf) {
int subsampling_x, int subsampling_y) { extend_frame(ybf, ybf->border);
extend_frame(ybf, subsampling_x, subsampling_y, ybf->border);
} }
void vp9_extend_frame_inner_borders_c(YV12_BUFFER_CONFIG *ybf, void vp9_extend_frame_inner_borders_c(YV12_BUFFER_CONFIG *ybf) {
int subsampling_x, int subsampling_y) {
const int inner_bw = (ybf->border > VP9INNERBORDERINPIXELS) ? const int inner_bw = (ybf->border > VP9INNERBORDERINPIXELS) ?
VP9INNERBORDERINPIXELS : ybf->border; VP9INNERBORDERINPIXELS : ybf->border;
extend_frame(ybf, subsampling_x, subsampling_y, inner_bw); extend_frame(ybf, inner_bw);
} }
#endif // CONFIG_VP9 #endif // CONFIG_VP9

4
vpx_scale/vpx_scale_rtcd.sh
View File

@ -26,9 +26,9 @@ prototype void vpx_yv12_copy_y "const struct yv12_buffer_config *src_ybc, struct
specialize vpx_yv12_copy_y neon specialize vpx_yv12_copy_y neon
if [ "$CONFIG_VP9" = "yes" ]; then 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 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 specialize vp9_extend_frame_inner_borders dspr2
fi fi