From 6a7a4ba75346a22d9f1f92b731498055788e0f5a Mon Sep 17 00:00:00 2001 From: Yaowu Xu Date: Wed, 7 Aug 2013 10:54:20 -0700 Subject: [PATCH] renamed vp8_yv12_copy_y to vpx_yv12_copy_y Becuase the routine is used by both vp8 and vp9 Change-Id: I2d35b287b5bc2394865d931a27da61f4ce7edeeb --- vp8/encoder/picklpf.c | 6 +++--- vp9/encoder/vp9_picklpf.c | 8 ++++---- vpx_scale/arm/neon/vp8_vpxyv12_copy_y_neon.asm | 4 ++-- vpx_scale/generic/yv12extend.c | 2 +- vpx_scale/vpx_scale_rtcd.sh | 4 ++-- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/vp8/encoder/picklpf.c b/vp8/encoder/picklpf.c index 841e1e452..250d04c7f 100644 --- a/vp8/encoder/picklpf.c +++ b/vp8/encoder/picklpf.c @@ -313,7 +313,7 @@ void vp8cx_pick_filter_level(YV12_BUFFER_CONFIG *sd, VP8_COMP *cpi) /* Get baseline error score */ /* Copy the unfiltered / processed recon buffer to the new buffer */ - vp8_yv12_copy_y(saved_frame, cm->frame_to_show); + vpx_yv12_copy_y(saved_frame, cm->frame_to_show); vp8cx_set_alt_lf_level(cpi, filt_mid); vp8_loop_filter_frame_yonly(cm, &cpi->mb.e_mbd, filt_mid); @@ -339,7 +339,7 @@ void vp8cx_pick_filter_level(YV12_BUFFER_CONFIG *sd, VP8_COMP *cpi) if(ss_err[filt_low] == 0) { /* Get Low filter error score */ - vp8_yv12_copy_y(saved_frame, cm->frame_to_show); + vpx_yv12_copy_y(saved_frame, cm->frame_to_show); vp8cx_set_alt_lf_level(cpi, filt_low); vp8_loop_filter_frame_yonly(cm, &cpi->mb.e_mbd, filt_low); @@ -367,7 +367,7 @@ void vp8cx_pick_filter_level(YV12_BUFFER_CONFIG *sd, VP8_COMP *cpi) { if(ss_err[filt_high] == 0) { - vp8_yv12_copy_y(saved_frame, cm->frame_to_show); + vpx_yv12_copy_y(saved_frame, cm->frame_to_show); vp8cx_set_alt_lf_level(cpi, filt_high); vp8_loop_filter_frame_yonly(cm, &cpi->mb.e_mbd, filt_high); diff --git a/vp9/encoder/vp9_picklpf.c b/vp9/encoder/vp9_picklpf.c index ff0951bd5..74abec6bd 100644 --- a/vp9/encoder/vp9_picklpf.c +++ b/vp9/encoder/vp9_picklpf.c @@ -149,7 +149,7 @@ void vp9_pick_filter_level(YV12_BUFFER_CONFIG *sd, VP9_COMP *cpi) { int Bias = 0; // Bias against raising loop filter and in favour of lowering it // Make a copy of the unfiltered / processed recon buffer - vp8_yv12_copy_y(cm->frame_to_show, &cpi->last_frame_uf); + vpx_yv12_copy_y(cm->frame_to_show, &cpi->last_frame_uf); if (cm->frame_type == KEY_FRAME) lf->sharpness_level = 0; @@ -175,7 +175,7 @@ void vp9_pick_filter_level(YV12_BUFFER_CONFIG *sd, VP9_COMP *cpi) { filt_best = filt_mid; // Re-instate the unfiltered frame - vp8_yv12_copy_y(&cpi->last_frame_uf, cm->frame_to_show); + vpx_yv12_copy_y(&cpi->last_frame_uf, cm->frame_to_show); while (filter_step > 0) { Bias = (best_err >> (15 - (filt_mid / 8))) * filter_step; // PGW change 12/12/06 for small images @@ -199,7 +199,7 @@ void vp9_pick_filter_level(YV12_BUFFER_CONFIG *sd, VP9_COMP *cpi) { filt_err = vp9_calc_ss_err(sd, cm->frame_to_show); // Re-instate the unfiltered frame - vp8_yv12_copy_y(&cpi->last_frame_uf, cm->frame_to_show); + vpx_yv12_copy_y(&cpi->last_frame_uf, cm->frame_to_show); // If value is close to the best so far then bias towards a lower loop filter value. if ((filt_err - Bias) < best_err) { @@ -219,7 +219,7 @@ void vp9_pick_filter_level(YV12_BUFFER_CONFIG *sd, VP9_COMP *cpi) { filt_err = vp9_calc_ss_err(sd, cm->frame_to_show); // Re-instate the unfiltered frame - vp8_yv12_copy_y(&cpi->last_frame_uf, cm->frame_to_show); + vpx_yv12_copy_y(&cpi->last_frame_uf, cm->frame_to_show); // Was it better than the previous best? if (filt_err < (best_err - Bias)) { diff --git a/vpx_scale/arm/neon/vp8_vpxyv12_copy_y_neon.asm b/vpx_scale/arm/neon/vp8_vpxyv12_copy_y_neon.asm index cc1789a82..dc6e1221a 100644 --- a/vpx_scale/arm/neon/vp8_vpxyv12_copy_y_neon.asm +++ b/vpx_scale/arm/neon/vp8_vpxyv12_copy_y_neon.asm @@ -9,7 +9,7 @@ ; - EXPORT |vp8_yv12_copy_y_neon| + EXPORT |vpx_yv12_copy_y_neon| ARM REQUIRE8 @@ -20,7 +20,7 @@ AREA ||.text||, CODE, READONLY, ALIGN=2 ;void vpxyv12_copy_y_neon(YV12_BUFFER_CONFIG *src_ybc, YV12_BUFFER_CONFIG *dst_ybc) -|vp8_yv12_copy_y_neon| PROC +|vpx_yv12_copy_y_neon| PROC push {r4 - r11, lr} vpush {d8-d15} diff --git a/vpx_scale/generic/yv12extend.c b/vpx_scale/generic/yv12extend.c index cc8da2ac0..ddad0f2c5 100644 --- a/vpx_scale/generic/yv12extend.c +++ b/vpx_scale/generic/yv12extend.c @@ -200,7 +200,7 @@ vp8_yv12_copy_frame_c(YV12_BUFFER_CONFIG *src_ybc, vp8_yv12_extend_frame_borders_c(dst_ybc); } -void vp8_yv12_copy_y_c(YV12_BUFFER_CONFIG *src_ybc, +void vpx_yv12_copy_y_c(YV12_BUFFER_CONFIG *src_ybc, YV12_BUFFER_CONFIG *dst_ybc) { int row; unsigned char *source, *dest; diff --git a/vpx_scale/vpx_scale_rtcd.sh b/vpx_scale/vpx_scale_rtcd.sh index 21d1e52d6..efd1bee6b 100644 --- a/vpx_scale/vpx_scale_rtcd.sh +++ b/vpx_scale/vpx_scale_rtcd.sh @@ -22,8 +22,8 @@ specialize vp8_yv12_extend_frame_borders neon prototype void vp8_yv12_copy_frame "struct yv12_buffer_config *src_ybc, struct yv12_buffer_config *dst_ybc" specialize vp8_yv12_copy_frame neon -prototype void vp8_yv12_copy_y "struct yv12_buffer_config *src_ybc, struct yv12_buffer_config *dst_ybc" -specialize vp8_yv12_copy_y neon +prototype void vpx_yv12_copy_y "struct yv12_buffer_config *src_ybc, struct yv12_buffer_config *dst_ybc" +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"