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

renamed vp8_yv12_copy_y to vpx_yv12_copy_y

Browse Source 
Becuase the routine is used by both vp8 and vp9

Change-Id: I2d35b287b5bc2394865d931a27da61f4ce7edeeb
This commit is contained in:
Yaowu Xu 2013-08-07 10:54:20 -07:00
parent c7c9901845
commit 6a7a4ba753
5 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
vp8/encoder/picklpf.c
View File

@ -313,7 +313,7 @@ void vp8cx_pick_filter_level(YV12_BUFFER_CONFIG *sd, VP8_COMP *cpi)
/* Get baseline error score */ /* Get baseline error score */
/* Copy the unfiltered / processed recon buffer to the new buffer */ /* 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); vp8cx_set_alt_lf_level(cpi, filt_mid);
vp8_loop_filter_frame_yonly(cm, &cpi->mb.e_mbd, 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) if(ss_err[filt_low] == 0)
{ {
/* Get Low filter error score */ /* 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); vp8cx_set_alt_lf_level(cpi, filt_low);
vp8_loop_filter_frame_yonly(cm, &cpi->mb.e_mbd, 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) 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); vp8cx_set_alt_lf_level(cpi, filt_high);
vp8_loop_filter_frame_yonly(cm, &cpi->mb.e_mbd, filt_high); vp8_loop_filter_frame_yonly(cm, &cpi->mb.e_mbd, filt_high);

8
vp9/encoder/vp9_picklpf.c
View File

@ -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 int Bias = 0; // Bias against raising loop filter and in favour of lowering it
// Make a copy of the unfiltered / processed recon buffer // 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) if (cm->frame_type == KEY_FRAME)
lf->sharpness_level = 0; lf->sharpness_level = 0;
@ -175,7 +175,7 @@ void vp9_pick_filter_level(YV12_BUFFER_CONFIG *sd, VP9_COMP *cpi) {
filt_best = filt_mid; filt_best = filt_mid;
// Re-instate the unfiltered frame // 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) { while (filter_step > 0) {
Bias = (best_err >> (15 - (filt_mid / 8))) * filter_step; // PGW change 12/12/06 for small images 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); filt_err = vp9_calc_ss_err(sd, cm->frame_to_show);
// Re-instate the unfiltered frame // 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 value is close to the best so far then bias towards a lower loop filter value.
if ((filt_err - Bias) < best_err) { 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); filt_err = vp9_calc_ss_err(sd, cm->frame_to_show);
// Re-instate the unfiltered frame // 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? // Was it better than the previous best?
if (filt_err < (best_err - Bias)) { if (filt_err < (best_err - Bias)) {

4
vpx_scale/arm/neon/vp8_vpxyv12_copy_y_neon.asm
View File

@ -9,7 +9,7 @@
; ;
EXPORT |vp8_yv12_copy_y_neon| EXPORT |vpx_yv12_copy_y_neon|
ARM ARM
REQUIRE8 REQUIRE8
@ -20,7 +20,7 @@
AREA ||.text||, CODE, READONLY, ALIGN=2 AREA ||.text||, CODE, READONLY, ALIGN=2
;void vpxyv12_copy_y_neon(YV12_BUFFER_CONFIG *src_ybc, YV12_BUFFER_CONFIG *dst_ybc) ;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} push {r4 - r11, lr}
vpush {d8-d15} vpush {d8-d15}

2
vpx_scale/generic/yv12extend.c
View File

@ -200,7 +200,7 @@ vp8_yv12_copy_frame_c(YV12_BUFFER_CONFIG *src_ybc,
vp8_yv12_extend_frame_borders_c(dst_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) { YV12_BUFFER_CONFIG *dst_ybc) {
int row; int row;
unsigned char *source, *dest; unsigned char *source, *dest;

4
vpx_scale/vpx_scale_rtcd.sh
View File

@ -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" prototype void vp8_yv12_copy_frame "struct yv12_buffer_config *src_ybc, struct yv12_buffer_config *dst_ybc"
specialize vp8_yv12_copy_frame neon specialize vp8_yv12_copy_frame neon
prototype void vp8_yv12_copy_y "struct yv12_buffer_config *src_ybc, struct yv12_buffer_config *dst_ybc" prototype void vpx_yv12_copy_y "struct yv12_buffer_config *src_ybc, struct yv12_buffer_config *dst_ybc"
specialize vp8_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, int subsampling_x, int subsampling_y"