ref: bbb9ca4535bf0f32706209fd4463e16cc8d42d7a
parent: d0307158cddcf71ae6f856924ad5cb7632fa55bd
parent: 89af744ba6450daa55d2985c826fa58c8317e8d8
author: Jingning Han <[email protected]>
date: Sat Aug 15 18:40:11 EDT 2015
Merge "Change vp9_ prefix function names in vpx_scale to vpx_"
--- a/vp10/common/alloccommon.c
+++ b/vp10/common/alloccommon.c
@@ -77,14 +77,14 @@
}
vpx_free(pool->frame_bufs[i].mvs);
pool->frame_bufs[i].mvs = NULL;
- vp9_free_frame_buffer(&pool->frame_bufs[i].buf);
+ vpx_free_frame_buffer(&pool->frame_bufs[i].buf);
}
}
void vp10_free_postproc_buffers(VP10_COMMON *cm) {#if CONFIG_VP9_POSTPROC
- vp9_free_frame_buffer(&cm->post_proc_buffer);
- vp9_free_frame_buffer(&cm->post_proc_buffer_int);
+ vpx_free_frame_buffer(&cm->post_proc_buffer);
+ vpx_free_frame_buffer(&cm->post_proc_buffer_int);
#else
(void)cm;
#endif
--- a/vp10/common/postproc.c
+++ b/vp10/common/postproc.c
@@ -659,7 +659,7 @@
const int width = ALIGN_POWER_OF_TWO(cm->width, 4);
const int height = ALIGN_POWER_OF_TWO(cm->height, 4);
- if (vp9_alloc_frame_buffer(&cm->post_proc_buffer_int, width, height,
+ if (vpx_alloc_frame_buffer(&cm->post_proc_buffer_int, width, height,
cm->subsampling_x, cm->subsampling_y,
#if CONFIG_VP9_HIGHBITDEPTH
cm->use_highbitdepth,
@@ -677,7 +677,7 @@
}
}
- if (vp9_realloc_frame_buffer(&cm->post_proc_buffer, cm->width, cm->height,
+ if (vpx_realloc_frame_buffer(&cm->post_proc_buffer, cm->width, cm->height,
cm->subsampling_x, cm->subsampling_y,
#if CONFIG_VP9_HIGHBITDEPTH
cm->use_highbitdepth,
--- a/vp10/decoder/decodeframe.c
+++ b/vp10/decoder/decodeframe.c
@@ -1236,7 +1236,7 @@
setup_display_size(cm, rb);
lock_buffer_pool(pool);
- if (vp9_realloc_frame_buffer(
+ if (vpx_realloc_frame_buffer(
get_frame_new_buffer(cm), cm->width, cm->height,
cm->subsampling_x, cm->subsampling_y,
#if CONFIG_VP9_HIGHBITDEPTH
@@ -1317,7 +1317,7 @@
setup_display_size(cm, rb);
lock_buffer_pool(pool);
- if (vp9_realloc_frame_buffer(
+ if (vpx_realloc_frame_buffer(
get_frame_new_buffer(cm), cm->width, cm->height,
cm->subsampling_x, cm->subsampling_y,
#if CONFIG_VP9_HIGHBITDEPTH
--- a/vp10/encoder/denoiser.c
+++ b/vp10/encoder/denoiser.c
@@ -435,7 +435,7 @@
assert(denoiser != NULL);
for (i = 0; i < MAX_REF_FRAMES; ++i) {- fail = vp9_alloc_frame_buffer(&denoiser->running_avg_y[i], width, height,
+ fail = vpx_alloc_frame_buffer(&denoiser->running_avg_y[i], width, height,
ssx, ssy,
#if CONFIG_VP9_HIGHBITDEPTH
use_highbitdepth,
@@ -450,7 +450,7 @@
#endif
}
- fail = vp9_alloc_frame_buffer(&denoiser->mc_running_avg_y, width, height,
+ fail = vpx_alloc_frame_buffer(&denoiser->mc_running_avg_y, width, height,
ssx, ssy,
#if CONFIG_VP9_HIGHBITDEPTH
use_highbitdepth,
@@ -476,9 +476,9 @@
return;
}
for (i = 0; i < MAX_REF_FRAMES; ++i) {- vp9_free_frame_buffer(&denoiser->running_avg_y[i]);
+ vpx_free_frame_buffer(&denoiser->running_avg_y[i]);
}
- vp9_free_frame_buffer(&denoiser->mc_running_avg_y);
+ vpx_free_frame_buffer(&denoiser->mc_running_avg_y);
}
#ifdef OUTPUT_YUV_DENOISED
--- a/vp10/encoder/encoder.c
+++ b/vp10/encoder/encoder.c
@@ -382,10 +382,10 @@
#endif
vp10_free_context_buffers(cm);
- vp9_free_frame_buffer(&cpi->last_frame_uf);
- vp9_free_frame_buffer(&cpi->scaled_source);
- vp9_free_frame_buffer(&cpi->scaled_last_source);
- vp9_free_frame_buffer(&cpi->alt_ref_buffer);
+ vpx_free_frame_buffer(&cpi->last_frame_uf);
+ vpx_free_frame_buffer(&cpi->scaled_source);
+ vpx_free_frame_buffer(&cpi->scaled_last_source);
+ vpx_free_frame_buffer(&cpi->alt_ref_buffer);
vp10_lookahead_destroy(cpi->lookahead);
vpx_free(cpi->tile_tok[0][0]);
@@ -406,12 +406,12 @@
}
for (i = 0; i < MAX_LAG_BUFFERS; ++i) {- vp9_free_frame_buffer(&cpi->svc.scaled_frames[i]);
+ vpx_free_frame_buffer(&cpi->svc.scaled_frames[i]);
}
memset(&cpi->svc.scaled_frames[0], 0,
MAX_LAG_BUFFERS * sizeof(cpi->svc.scaled_frames[0]));
- vp9_free_frame_buffer(&cpi->svc.empty_frame.img);
+ vpx_free_frame_buffer(&cpi->svc.empty_frame.img);
memset(&cpi->svc.empty_frame, 0, sizeof(cpi->svc.empty_frame));
}
@@ -628,7 +628,7 @@
"Failed to allocate lag buffers");
// TODO(agrange) Check if ARF is enabled and skip allocation if not.
- if (vp9_realloc_frame_buffer(&cpi->alt_ref_buffer,
+ if (vpx_realloc_frame_buffer(&cpi->alt_ref_buffer,
oxcf->width, oxcf->height,
cm->subsampling_x, cm->subsampling_y,
#if CONFIG_VP9_HIGHBITDEPTH
@@ -642,7 +642,7 @@
static void alloc_util_frame_buffers(VP10_COMP *cpi) {VP10_COMMON *const cm = &cpi->common;
- if (vp9_realloc_frame_buffer(&cpi->last_frame_uf,
+ if (vpx_realloc_frame_buffer(&cpi->last_frame_uf,
cm->width, cm->height,
cm->subsampling_x, cm->subsampling_y,
#if CONFIG_VP9_HIGHBITDEPTH
@@ -653,7 +653,7 @@
vpx_internal_error(&cm->error, VPX_CODEC_MEM_ERROR,
"Failed to allocate last frame buffer");
- if (vp9_realloc_frame_buffer(&cpi->scaled_source,
+ if (vpx_realloc_frame_buffer(&cpi->scaled_source,
cm->width, cm->height,
cm->subsampling_x, cm->subsampling_y,
#if CONFIG_VP9_HIGHBITDEPTH
@@ -664,7 +664,7 @@
vpx_internal_error(&cm->error, VPX_CODEC_MEM_ERROR,
"Failed to allocate scaled source buffer");
- if (vp9_realloc_frame_buffer(&cpi->scaled_last_source,
+ if (vpx_realloc_frame_buffer(&cpi->scaled_last_source,
cm->width, cm->height,
cm->subsampling_x, cm->subsampling_y,
#if CONFIG_VP9_HIGHBITDEPTH
@@ -743,7 +743,7 @@
set_tile_limits(cpi);
if (is_two_pass_svc(cpi)) {- if (vp9_realloc_frame_buffer(&cpi->alt_ref_buffer,
+ if (vpx_realloc_frame_buffer(&cpi->alt_ref_buffer,
cm->width, cm->height,
cm->subsampling_x, cm->subsampling_y,
#if CONFIG_VP9_HIGHBITDEPTH
@@ -2548,7 +2548,7 @@
dsts[i], dst_heights[i], dst_widths[i], dst_strides[i]);
#endif // CONFIG_VP9_HIGHBITDEPTH
}
- vp9_extend_frame_borders(dst);
+ vpx_extend_frame_borders(dst);
}
#if CONFIG_VP9_HIGHBITDEPTH
@@ -2603,7 +2603,7 @@
}
}
- vp9_extend_frame_borders(dst);
+ vpx_extend_frame_borders(dst);
}
static int scale_down(VP10_COMP *cpi, int q) {@@ -2769,7 +2769,7 @@
vp10_loop_filter_frame(cm->frame_to_show, cm, xd, lf->filter_level, 0, 0);
}
- vp9_extend_frame_inner_borders(cm->frame_to_show);
+ vpx_extend_frame_inner_borders(cm->frame_to_show);
}
static INLINE void alloc_frame_mvs(const VP10_COMMON *cm,
@@ -2819,7 +2819,7 @@
if (force_scaling ||
new_fb_ptr->buf.y_crop_width != cm->width ||
new_fb_ptr->buf.y_crop_height != cm->height) {- vp9_realloc_frame_buffer(&new_fb_ptr->buf,
+ vpx_realloc_frame_buffer(&new_fb_ptr->buf,
cm->width, cm->height,
cm->subsampling_x, cm->subsampling_y,
cm->use_highbitdepth,
@@ -2844,7 +2844,7 @@
if (force_scaling ||
new_fb_ptr->buf.y_crop_width != cm->width ||
new_fb_ptr->buf.y_crop_height != cm->height) {- vp9_realloc_frame_buffer(&new_fb_ptr->buf,
+ vpx_realloc_frame_buffer(&new_fb_ptr->buf,
cm->width, cm->height,
cm->subsampling_x, cm->subsampling_y,
VP9_ENC_BORDER_IN_PIXELS, cm->byte_alignment,
@@ -3139,7 +3139,7 @@
alloc_frame_mvs(cm, cm->new_fb_idx);
// Reset the frame pointers to the current frame size.
- vp9_realloc_frame_buffer(get_frame_new_buffer(cm),
+ vpx_realloc_frame_buffer(get_frame_new_buffer(cm),
cm->width, cm->height,
cm->subsampling_x, cm->subsampling_y,
#if CONFIG_VP9_HIGHBITDEPTH
@@ -3172,7 +3172,7 @@
cm->width, cm->height);
#endif // CONFIG_VP9_HIGHBITDEPTH
if (vp10_is_scaled(&ref_buf->sf))
- vp9_extend_frame_borders(buf);
+ vpx_extend_frame_borders(buf);
} else {ref_buf->buf = NULL;
}
@@ -3563,7 +3563,7 @@
// For 2x2 scaling down.
vpx_scale_frame(unscaled, scaled, unscaled->y_buffer, 9, 2, 1,
2, 1, 0);
- vp9_extend_frame_borders(scaled);
+ vpx_extend_frame_borders(scaled);
return scaled;
} else {return unscaled;
@@ -4179,7 +4179,7 @@
if (oxcf->arnr_max_frames > 0) {// Produce the filtered ARF frame.
vp10_temporal_filter(cpi, arf_src_index);
- vp9_extend_frame_borders(&cpi->alt_ref_buffer);
+ vpx_extend_frame_borders(&cpi->alt_ref_buffer);
force_src_buffer = &cpi->alt_ref_buffer;
}
@@ -4386,7 +4386,7 @@
PSNR_STATS psnr2;
double frame_ssim2 = 0, weight = 0;
#if CONFIG_VP9_POSTPROC
- if (vp9_alloc_frame_buffer(&cm->post_proc_buffer,
+ if (vpx_alloc_frame_buffer(&cm->post_proc_buffer,
recon->y_crop_width, recon->y_crop_height,
cm->subsampling_x, cm->subsampling_y,
#if CONFIG_VP9_HIGHBITDEPTH
--- a/vp10/encoder/firstpass.c
+++ b/vp10/encoder/firstpass.c
@@ -1114,7 +1114,7 @@
++twopass->sr_update_lag;
}
- vp9_extend_frame_borders(new_yv12);
+ vpx_extend_frame_borders(new_yv12);
if (lc != NULL) {vp10_update_reference_frames(cpi);
--- a/vp10/encoder/lookahead.c
+++ b/vp10/encoder/lookahead.c
@@ -38,7 +38,7 @@
unsigned int i;
for (i = 0; i < ctx->max_sz; i++)
- vp9_free_frame_buffer(&ctx->buf[i].img);
+ vpx_free_frame_buffer(&ctx->buf[i].img);
free(ctx->buf);
}
free(ctx);
@@ -72,7 +72,7 @@
if (!ctx->buf)
goto bail;
for (i = 0; i < depth; i++)
- if (vp9_alloc_frame_buffer(&ctx->buf[i].img,
+ if (vpx_alloc_frame_buffer(&ctx->buf[i].img,
width, height, subsampling_x, subsampling_y,
#if CONFIG_VP9_HIGHBITDEPTH
use_highbitdepth,
@@ -172,7 +172,7 @@
if (larger_dimensions) {YV12_BUFFER_CONFIG new_img;
memset(&new_img, 0, sizeof(new_img));
- if (vp9_alloc_frame_buffer(&new_img,
+ if (vpx_alloc_frame_buffer(&new_img,
width, height, subsampling_x, subsampling_y,
#if CONFIG_VP9_HIGHBITDEPTH
use_highbitdepth,
@@ -180,7 +180,7 @@
VP9_ENC_BORDER_IN_PIXELS,
0))
return 1;
- vp9_free_frame_buffer(&buf->img);
+ vpx_free_frame_buffer(&buf->img);
buf->img = new_img;
} else if (new_dimensions) {buf->img.y_crop_width = src->y_crop_width;
--- a/vp10/encoder/skin_detection.c
+++ b/vp10/encoder/skin_detection.c
@@ -61,10 +61,10 @@
const int src_uvstride = cpi->Source->uv_stride;
YV12_BUFFER_CONFIG skinmap;
memset(&skinmap, 0, sizeof(YV12_BUFFER_CONFIG));
- if (vp9_alloc_frame_buffer(&skinmap, cm->width, cm->height,
+ if (vpx_alloc_frame_buffer(&skinmap, cm->width, cm->height,
cm->subsampling_x, cm->subsampling_y,
VP9_ENC_BORDER_IN_PIXELS, cm->byte_alignment)) {- vp9_free_frame_buffer(&skinmap);
+ vpx_free_frame_buffer(&skinmap);
return;
}
memset(skinmap.buffer_alloc, 128, skinmap.frame_size);
@@ -99,6 +99,6 @@
src_v += (src_uvstride << 2) - ((cm->mi_cols - 1) << 2);
}
vp10_write_yuv_frame_420(&skinmap, yuv_skinmap_file);
- vp9_free_frame_buffer(&skinmap);
+ vpx_free_frame_buffer(&skinmap);
}
#endif
--- a/vp10/encoder/svc_layercontext.c
+++ b/vp10/encoder/svc_layercontext.c
@@ -28,7 +28,7 @@
svc->temporal_layer_id = 0;
if (cpi->oxcf.error_resilient_mode == 0 && cpi->oxcf.pass == 2) {- if (vp9_realloc_frame_buffer(&cpi->svc.empty_frame.img,
+ if (vpx_realloc_frame_buffer(&cpi->svc.empty_frame.img,
SMALL_FRAME_WIDTH, SMALL_FRAME_HEIGHT,
cpi->common.subsampling_x,
cpi->common.subsampling_y,
--- a/vp10/encoder/temporal_filter.c
+++ b/vp10/encoder/temporal_filter.c
@@ -705,7 +705,7 @@
for (frame = 0; frame < frames_to_blur; ++frame) {if (cm->mi_cols * MI_SIZE != frames[frame]->y_width ||
cm->mi_rows * MI_SIZE != frames[frame]->y_height) {- if (vp9_realloc_frame_buffer(&cpi->svc.scaled_frames[frame_used],
+ if (vpx_realloc_frame_buffer(&cpi->svc.scaled_frames[frame_used],
cm->width, cm->height,
cm->subsampling_x, cm->subsampling_y,
#if CONFIG_VP9_HIGHBITDEPTH
--- a/vp9/common/vp9_alloccommon.c
+++ b/vp9/common/vp9_alloccommon.c
@@ -95,14 +95,14 @@
}
vpx_free(pool->frame_bufs[i].mvs);
pool->frame_bufs[i].mvs = NULL;
- vp9_free_frame_buffer(&pool->frame_bufs[i].buf);
+ vpx_free_frame_buffer(&pool->frame_bufs[i].buf);
}
}
void vp9_free_postproc_buffers(VP9_COMMON *cm) {#if CONFIG_VP9_POSTPROC
- vp9_free_frame_buffer(&cm->post_proc_buffer);
- vp9_free_frame_buffer(&cm->post_proc_buffer_int);
+ vpx_free_frame_buffer(&cm->post_proc_buffer);
+ vpx_free_frame_buffer(&cm->post_proc_buffer_int);
#else
(void)cm;
#endif
--- a/vp9/common/vp9_postproc.c
+++ b/vp9/common/vp9_postproc.c
@@ -659,7 +659,7 @@
const int width = ALIGN_POWER_OF_TWO(cm->width, 4);
const int height = ALIGN_POWER_OF_TWO(cm->height, 4);
- if (vp9_alloc_frame_buffer(&cm->post_proc_buffer_int, width, height,
+ if (vpx_alloc_frame_buffer(&cm->post_proc_buffer_int, width, height,
cm->subsampling_x, cm->subsampling_y,
#if CONFIG_VP9_HIGHBITDEPTH
cm->use_highbitdepth,
@@ -677,7 +677,7 @@
}
}
- if (vp9_realloc_frame_buffer(&cm->post_proc_buffer, cm->width, cm->height,
+ if (vpx_realloc_frame_buffer(&cm->post_proc_buffer, cm->width, cm->height,
cm->subsampling_x, cm->subsampling_y,
#if CONFIG_VP9_HIGHBITDEPTH
cm->use_highbitdepth,
--- a/vp9/decoder/vp9_decodeframe.c
+++ b/vp9/decoder/vp9_decodeframe.c
@@ -1235,7 +1235,7 @@
setup_display_size(cm, rb);
lock_buffer_pool(pool);
- if (vp9_realloc_frame_buffer(
+ if (vpx_realloc_frame_buffer(
get_frame_new_buffer(cm), cm->width, cm->height,
cm->subsampling_x, cm->subsampling_y,
#if CONFIG_VP9_HIGHBITDEPTH
@@ -1316,7 +1316,7 @@
setup_display_size(cm, rb);
lock_buffer_pool(pool);
- if (vp9_realloc_frame_buffer(
+ if (vpx_realloc_frame_buffer(
get_frame_new_buffer(cm), cm->width, cm->height,
cm->subsampling_x, cm->subsampling_y,
#if CONFIG_VP9_HIGHBITDEPTH
--- a/vp9/encoder/vp9_denoiser.c
+++ b/vp9/encoder/vp9_denoiser.c
@@ -431,7 +431,7 @@
assert(denoiser != NULL);
for (i = 0; i < MAX_REF_FRAMES; ++i) {- fail = vp9_alloc_frame_buffer(&denoiser->running_avg_y[i], width, height,
+ fail = vpx_alloc_frame_buffer(&denoiser->running_avg_y[i], width, height,
ssx, ssy,
#if CONFIG_VP9_HIGHBITDEPTH
use_highbitdepth,
@@ -446,7 +446,7 @@
#endif
}
- fail = vp9_alloc_frame_buffer(&denoiser->mc_running_avg_y, width, height,
+ fail = vpx_alloc_frame_buffer(&denoiser->mc_running_avg_y, width, height,
ssx, ssy,
#if CONFIG_VP9_HIGHBITDEPTH
use_highbitdepth,
@@ -472,9 +472,9 @@
return;
}
for (i = 0; i < MAX_REF_FRAMES; ++i) {- vp9_free_frame_buffer(&denoiser->running_avg_y[i]);
+ vpx_free_frame_buffer(&denoiser->running_avg_y[i]);
}
- vp9_free_frame_buffer(&denoiser->mc_running_avg_y);
+ vpx_free_frame_buffer(&denoiser->mc_running_avg_y);
}
#ifdef OUTPUT_YUV_DENOISED
--- a/vp9/encoder/vp9_encoder.c
+++ b/vp9/encoder/vp9_encoder.c
@@ -381,10 +381,10 @@
#endif
vp9_free_context_buffers(cm);
- vp9_free_frame_buffer(&cpi->last_frame_uf);
- vp9_free_frame_buffer(&cpi->scaled_source);
- vp9_free_frame_buffer(&cpi->scaled_last_source);
- vp9_free_frame_buffer(&cpi->alt_ref_buffer);
+ vpx_free_frame_buffer(&cpi->last_frame_uf);
+ vpx_free_frame_buffer(&cpi->scaled_source);
+ vpx_free_frame_buffer(&cpi->scaled_last_source);
+ vpx_free_frame_buffer(&cpi->alt_ref_buffer);
vp9_lookahead_destroy(cpi->lookahead);
vpx_free(cpi->tile_tok[0][0]);
@@ -405,12 +405,12 @@
}
for (i = 0; i < MAX_LAG_BUFFERS; ++i) {- vp9_free_frame_buffer(&cpi->svc.scaled_frames[i]);
+ vpx_free_frame_buffer(&cpi->svc.scaled_frames[i]);
}
memset(&cpi->svc.scaled_frames[0], 0,
MAX_LAG_BUFFERS * sizeof(cpi->svc.scaled_frames[0]));
- vp9_free_frame_buffer(&cpi->svc.empty_frame.img);
+ vpx_free_frame_buffer(&cpi->svc.empty_frame.img);
memset(&cpi->svc.empty_frame, 0, sizeof(cpi->svc.empty_frame));
}
@@ -627,7 +627,7 @@
"Failed to allocate lag buffers");
// TODO(agrange) Check if ARF is enabled and skip allocation if not.
- if (vp9_realloc_frame_buffer(&cpi->alt_ref_buffer,
+ if (vpx_realloc_frame_buffer(&cpi->alt_ref_buffer,
oxcf->width, oxcf->height,
cm->subsampling_x, cm->subsampling_y,
#if CONFIG_VP9_HIGHBITDEPTH
@@ -641,7 +641,7 @@
static void alloc_util_frame_buffers(VP9_COMP *cpi) {VP9_COMMON *const cm = &cpi->common;
- if (vp9_realloc_frame_buffer(&cpi->last_frame_uf,
+ if (vpx_realloc_frame_buffer(&cpi->last_frame_uf,
cm->width, cm->height,
cm->subsampling_x, cm->subsampling_y,
#if CONFIG_VP9_HIGHBITDEPTH
@@ -652,7 +652,7 @@
vpx_internal_error(&cm->error, VPX_CODEC_MEM_ERROR,
"Failed to allocate last frame buffer");
- if (vp9_realloc_frame_buffer(&cpi->scaled_source,
+ if (vpx_realloc_frame_buffer(&cpi->scaled_source,
cm->width, cm->height,
cm->subsampling_x, cm->subsampling_y,
#if CONFIG_VP9_HIGHBITDEPTH
@@ -663,7 +663,7 @@
vpx_internal_error(&cm->error, VPX_CODEC_MEM_ERROR,
"Failed to allocate scaled source buffer");
- if (vp9_realloc_frame_buffer(&cpi->scaled_last_source,
+ if (vpx_realloc_frame_buffer(&cpi->scaled_last_source,
cm->width, cm->height,
cm->subsampling_x, cm->subsampling_y,
#if CONFIG_VP9_HIGHBITDEPTH
@@ -742,7 +742,7 @@
set_tile_limits(cpi);
if (is_two_pass_svc(cpi)) {- if (vp9_realloc_frame_buffer(&cpi->alt_ref_buffer,
+ if (vpx_realloc_frame_buffer(&cpi->alt_ref_buffer,
cm->width, cm->height,
cm->subsampling_x, cm->subsampling_y,
#if CONFIG_VP9_HIGHBITDEPTH
@@ -2547,7 +2547,7 @@
dsts[i], dst_heights[i], dst_widths[i], dst_strides[i]);
#endif // CONFIG_VP9_HIGHBITDEPTH
}
- vp9_extend_frame_borders(dst);
+ vpx_extend_frame_borders(dst);
}
#if CONFIG_VP9_HIGHBITDEPTH
@@ -2602,7 +2602,7 @@
}
}
- vp9_extend_frame_borders(dst);
+ vpx_extend_frame_borders(dst);
}
static int scale_down(VP9_COMP *cpi, int q) {@@ -2768,7 +2768,7 @@
vp9_loop_filter_frame(cm->frame_to_show, cm, xd, lf->filter_level, 0, 0);
}
- vp9_extend_frame_inner_borders(cm->frame_to_show);
+ vpx_extend_frame_inner_borders(cm->frame_to_show);
}
static INLINE void alloc_frame_mvs(const VP9_COMMON *cm,
@@ -2818,7 +2818,7 @@
if (force_scaling ||
new_fb_ptr->buf.y_crop_width != cm->width ||
new_fb_ptr->buf.y_crop_height != cm->height) {- vp9_realloc_frame_buffer(&new_fb_ptr->buf,
+ vpx_realloc_frame_buffer(&new_fb_ptr->buf,
cm->width, cm->height,
cm->subsampling_x, cm->subsampling_y,
cm->use_highbitdepth,
@@ -2843,7 +2843,7 @@
if (force_scaling ||
new_fb_ptr->buf.y_crop_width != cm->width ||
new_fb_ptr->buf.y_crop_height != cm->height) {- vp9_realloc_frame_buffer(&new_fb_ptr->buf,
+ vpx_realloc_frame_buffer(&new_fb_ptr->buf,
cm->width, cm->height,
cm->subsampling_x, cm->subsampling_y,
VP9_ENC_BORDER_IN_PIXELS, cm->byte_alignment,
@@ -3138,7 +3138,7 @@
alloc_frame_mvs(cm, cm->new_fb_idx);
// Reset the frame pointers to the current frame size.
- vp9_realloc_frame_buffer(get_frame_new_buffer(cm),
+ vpx_realloc_frame_buffer(get_frame_new_buffer(cm),
cm->width, cm->height,
cm->subsampling_x, cm->subsampling_y,
#if CONFIG_VP9_HIGHBITDEPTH
@@ -3171,7 +3171,7 @@
cm->width, cm->height);
#endif // CONFIG_VP9_HIGHBITDEPTH
if (vp9_is_scaled(&ref_buf->sf))
- vp9_extend_frame_borders(buf);
+ vpx_extend_frame_borders(buf);
} else {ref_buf->buf = NULL;
}
@@ -3562,7 +3562,7 @@
// For 2x2 scaling down.
vpx_scale_frame(unscaled, scaled, unscaled->y_buffer, 9, 2, 1,
2, 1, 0);
- vp9_extend_frame_borders(scaled);
+ vpx_extend_frame_borders(scaled);
return scaled;
} else {return unscaled;
@@ -4178,7 +4178,7 @@
if (oxcf->arnr_max_frames > 0) {// Produce the filtered ARF frame.
vp9_temporal_filter(cpi, arf_src_index);
- vp9_extend_frame_borders(&cpi->alt_ref_buffer);
+ vpx_extend_frame_borders(&cpi->alt_ref_buffer);
force_src_buffer = &cpi->alt_ref_buffer;
}
@@ -4385,7 +4385,7 @@
PSNR_STATS psnr2;
double frame_ssim2 = 0, weight = 0;
#if CONFIG_VP9_POSTPROC
- if (vp9_alloc_frame_buffer(&cm->post_proc_buffer,
+ if (vpx_alloc_frame_buffer(&cm->post_proc_buffer,
recon->y_crop_width, recon->y_crop_height,
cm->subsampling_x, cm->subsampling_y,
#if CONFIG_VP9_HIGHBITDEPTH
--- a/vp9/encoder/vp9_firstpass.c
+++ b/vp9/encoder/vp9_firstpass.c
@@ -1112,7 +1112,7 @@
++twopass->sr_update_lag;
}
- vp9_extend_frame_borders(new_yv12);
+ vpx_extend_frame_borders(new_yv12);
if (lc != NULL) {vp9_update_reference_frames(cpi);
--- a/vp9/encoder/vp9_lookahead.c
+++ b/vp9/encoder/vp9_lookahead.c
@@ -38,7 +38,7 @@
unsigned int i;
for (i = 0; i < ctx->max_sz; i++)
- vp9_free_frame_buffer(&ctx->buf[i].img);
+ vpx_free_frame_buffer(&ctx->buf[i].img);
free(ctx->buf);
}
free(ctx);
@@ -72,7 +72,7 @@
if (!ctx->buf)
goto bail;
for (i = 0; i < depth; i++)
- if (vp9_alloc_frame_buffer(&ctx->buf[i].img,
+ if (vpx_alloc_frame_buffer(&ctx->buf[i].img,
width, height, subsampling_x, subsampling_y,
#if CONFIG_VP9_HIGHBITDEPTH
use_highbitdepth,
@@ -172,7 +172,7 @@
if (larger_dimensions) {YV12_BUFFER_CONFIG new_img;
memset(&new_img, 0, sizeof(new_img));
- if (vp9_alloc_frame_buffer(&new_img,
+ if (vpx_alloc_frame_buffer(&new_img,
width, height, subsampling_x, subsampling_y,
#if CONFIG_VP9_HIGHBITDEPTH
use_highbitdepth,
@@ -180,7 +180,7 @@
VP9_ENC_BORDER_IN_PIXELS,
0))
return 1;
- vp9_free_frame_buffer(&buf->img);
+ vpx_free_frame_buffer(&buf->img);
buf->img = new_img;
} else if (new_dimensions) {buf->img.y_crop_width = src->y_crop_width;
--- a/vp9/encoder/vp9_skin_detection.c
+++ b/vp9/encoder/vp9_skin_detection.c
@@ -61,10 +61,10 @@
const int src_uvstride = cpi->Source->uv_stride;
YV12_BUFFER_CONFIG skinmap;
memset(&skinmap, 0, sizeof(YV12_BUFFER_CONFIG));
- if (vp9_alloc_frame_buffer(&skinmap, cm->width, cm->height,
+ if (vpx_alloc_frame_buffer(&skinmap, cm->width, cm->height,
cm->subsampling_x, cm->subsampling_y,
VP9_ENC_BORDER_IN_PIXELS, cm->byte_alignment)) {- vp9_free_frame_buffer(&skinmap);
+ vpx_free_frame_buffer(&skinmap);
return;
}
memset(skinmap.buffer_alloc, 128, skinmap.frame_size);
@@ -99,6 +99,6 @@
src_v += (src_uvstride << 2) - ((cm->mi_cols - 1) << 2);
}
vp9_write_yuv_frame_420(&skinmap, yuv_skinmap_file);
- vp9_free_frame_buffer(&skinmap);
+ vpx_free_frame_buffer(&skinmap);
}
#endif
--- a/vp9/encoder/vp9_svc_layercontext.c
+++ b/vp9/encoder/vp9_svc_layercontext.c
@@ -28,7 +28,7 @@
svc->temporal_layer_id = 0;
if (cpi->oxcf.error_resilient_mode == 0 && cpi->oxcf.pass == 2) {- if (vp9_realloc_frame_buffer(&cpi->svc.empty_frame.img,
+ if (vpx_realloc_frame_buffer(&cpi->svc.empty_frame.img,
SMALL_FRAME_WIDTH, SMALL_FRAME_HEIGHT,
cpi->common.subsampling_x,
cpi->common.subsampling_y,
--- a/vp9/encoder/vp9_temporal_filter.c
+++ b/vp9/encoder/vp9_temporal_filter.c
@@ -705,7 +705,7 @@
for (frame = 0; frame < frames_to_blur; ++frame) {if (cm->mi_cols * MI_SIZE != frames[frame]->y_width ||
cm->mi_rows * MI_SIZE != frames[frame]->y_height) {- if (vp9_realloc_frame_buffer(&cpi->svc.scaled_frames[frame_used],
+ if (vpx_realloc_frame_buffer(&cpi->svc.scaled_frames[frame_used],
cm->width, cm->height,
cm->subsampling_x, cm->subsampling_y,
#if CONFIG_VP9_HIGHBITDEPTH
--- a/vpx_scale/generic/yv12config.c
+++ b/vpx_scale/generic/yv12config.c
@@ -117,7 +117,7 @@
#if CONFIG_VP9 || CONFIG_VP10
// TODO(jkoleszar): Maybe replace this with struct vpx_image
-int vp9_free_frame_buffer(YV12_BUFFER_CONFIG *ybf) {+int vpx_free_frame_buffer(YV12_BUFFER_CONFIG *ybf) { if (ybf) { if (ybf->buffer_alloc_sz > 0) {vpx_free(ybf->buffer_alloc);
@@ -134,7 +134,7 @@
return 0;
}
-int vp9_realloc_frame_buffer(YV12_BUFFER_CONFIG *ybf,
+int vpx_realloc_frame_buffer(YV12_BUFFER_CONFIG *ybf,
int width, int height,
int ss_x, int ss_y,
#if CONFIG_VP9_HIGHBITDEPTH
@@ -282,7 +282,7 @@
return -2;
}
-int vp9_alloc_frame_buffer(YV12_BUFFER_CONFIG *ybf,
+int vpx_alloc_frame_buffer(YV12_BUFFER_CONFIG *ybf,
int width, int height,
int ss_x, int ss_y,
#if CONFIG_VP9_HIGHBITDEPTH
@@ -291,8 +291,8 @@
int border,
int byte_alignment) { if (ybf) {- vp9_free_frame_buffer(ybf);
- return vp9_realloc_frame_buffer(ybf, width, height, ss_x, ss_y,
+ vpx_free_frame_buffer(ybf);
+ return vpx_realloc_frame_buffer(ybf, width, height, ss_x, ss_y,
#if CONFIG_VP9_HIGHBITDEPTH
use_highbitdepth,
#endif
--- a/vpx_scale/generic/yv12extend.c
+++ b/vpx_scale/generic/yv12extend.c
@@ -200,11 +200,11 @@
c_w, c_h, c_et, c_el, c_eb, c_er);
}
-void vp9_extend_frame_borders_c(YV12_BUFFER_CONFIG *ybf) {+void vpx_extend_frame_borders_c(YV12_BUFFER_CONFIG *ybf) {extend_frame(ybf, ybf->border);
}
-void vp9_extend_frame_inner_borders_c(YV12_BUFFER_CONFIG *ybf) {+void vpx_extend_frame_inner_borders_c(YV12_BUFFER_CONFIG *ybf) {const int inner_bw = (ybf->border > VP9INNERBORDERINPIXELS) ?
VP9INNERBORDERINPIXELS : ybf->border;
extend_frame(ybf, inner_bw);
--- a/vpx_scale/mips/dspr2/yv12extend_dspr2.c
+++ b/vpx_scale/mips/dspr2/yv12extend_dspr2.c
@@ -132,11 +132,11 @@
c_w, c_h, c_et, c_el, c_eb, c_er);
}
-void vp9_extend_frame_borders_dspr2(YV12_BUFFER_CONFIG *ybf) {+void vpx_extend_frame_borders_dspr2(YV12_BUFFER_CONFIG *ybf) {extend_frame(ybf, ybf->border);
}
-void vp9_extend_frame_inner_borders_dspr2(YV12_BUFFER_CONFIG *ybf) {+void vpx_extend_frame_inner_borders_dspr2(YV12_BUFFER_CONFIG *ybf) {const int inner_bw = (ybf->border > VP9INNERBORDERINPIXELS) ?
VP9INNERBORDERINPIXELS : ybf->border;
extend_frame(ybf, inner_bw);
--- a/vpx_scale/vpx_scale_rtcd.pl
+++ b/vpx_scale/vpx_scale_rtcd.pl
@@ -23,10 +23,10 @@
add_proto qw/void vpx_yv12_copy_y/, "const struct yv12_buffer_config *src_ybc, struct yv12_buffer_config *dst_ybc";
if ((vpx_config("CONFIG_VP9") eq "yes") || (vpx_config("CONFIG_VP10") eq "yes")) {- add_proto qw/void vp9_extend_frame_borders/, "struct yv12_buffer_config *ybf";
- specialize qw/vp9_extend_frame_borders dspr2/;
+ add_proto qw/void vpx_extend_frame_borders/, "struct yv12_buffer_config *ybf";
+ specialize qw/vpx_extend_frame_borders dspr2/;
- add_proto qw/void vp9_extend_frame_inner_borders/, "struct yv12_buffer_config *ybf";
- specialize qw/vp9_extend_frame_inner_borders dspr2/;
+ add_proto qw/void vpx_extend_frame_inner_borders/, "struct yv12_buffer_config *ybf";
+ specialize qw/vpx_extend_frame_inner_borders dspr2/;
}
1;
--- a/vpx_scale/yv12config.h
+++ b/vpx_scale/yv12config.h
@@ -69,7 +69,7 @@
int width, int height, int border);
int vp8_yv12_de_alloc_frame_buffer(YV12_BUFFER_CONFIG *ybf);
-int vp9_alloc_frame_buffer(YV12_BUFFER_CONFIG *ybf,
+int vpx_alloc_frame_buffer(YV12_BUFFER_CONFIG *ybf,
int width, int height, int ss_x, int ss_y,
#if CONFIG_VP9_HIGHBITDEPTH
int use_highbitdepth,
@@ -83,7 +83,7 @@
// to decode the current frame. If cb is NULL, libvpx will allocate memory
// internally to decode the current frame. Returns 0 on success. Returns < 0
// on failure.
-int vp9_realloc_frame_buffer(YV12_BUFFER_CONFIG *ybf,
+int vpx_realloc_frame_buffer(YV12_BUFFER_CONFIG *ybf,
int width, int height, int ss_x, int ss_y,
#if CONFIG_VP9_HIGHBITDEPTH
int use_highbitdepth,
@@ -93,7 +93,7 @@
vpx_codec_frame_buffer_t *fb,
vpx_get_frame_buffer_cb_fn_t cb,
void *cb_priv);
-int vp9_free_frame_buffer(YV12_BUFFER_CONFIG *ybf);
+int vpx_free_frame_buffer(YV12_BUFFER_CONFIG *ybf);
#ifdef __cplusplus
}