Commit 89af744b authored by Jingning Han's avatar Jingning Han

Change vp9_ prefix function names in vpx_scale to vpx_

Change-Id: Iac85902cbbb3e752801dc85de9a3c778e47304aa
parent d04a0d77
...@@ -77,14 +77,14 @@ void vp10_free_ref_frame_buffers(BufferPool *pool) { ...@@ -77,14 +77,14 @@ void vp10_free_ref_frame_buffers(BufferPool *pool) {
} }
vpx_free(pool->frame_bufs[i].mvs); vpx_free(pool->frame_bufs[i].mvs);
pool->frame_bufs[i].mvs = NULL; 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) { void vp10_free_postproc_buffers(VP10_COMMON *cm) {
#if CONFIG_VP9_POSTPROC #if CONFIG_VP9_POSTPROC
vp9_free_frame_buffer(&cm->post_proc_buffer); vpx_free_frame_buffer(&cm->post_proc_buffer);
vp9_free_frame_buffer(&cm->post_proc_buffer_int); vpx_free_frame_buffer(&cm->post_proc_buffer_int);
#else #else
(void)cm; (void)cm;
#endif #endif
......
...@@ -659,7 +659,7 @@ int vp10_post_proc_frame(struct VP10Common *cm, ...@@ -659,7 +659,7 @@ int vp10_post_proc_frame(struct VP10Common *cm,
const int width = ALIGN_POWER_OF_TWO(cm->width, 4); const int width = ALIGN_POWER_OF_TWO(cm->width, 4);
const int height = ALIGN_POWER_OF_TWO(cm->height, 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, cm->subsampling_x, cm->subsampling_y,
#if CONFIG_VP9_HIGHBITDEPTH #if CONFIG_VP9_HIGHBITDEPTH
cm->use_highbitdepth, cm->use_highbitdepth,
...@@ -677,7 +677,7 @@ int vp10_post_proc_frame(struct VP10Common *cm, ...@@ -677,7 +677,7 @@ int vp10_post_proc_frame(struct VP10Common *cm,
} }
} }
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, cm->subsampling_x, cm->subsampling_y,
#if CONFIG_VP9_HIGHBITDEPTH #if CONFIG_VP9_HIGHBITDEPTH
cm->use_highbitdepth, cm->use_highbitdepth,
......
...@@ -1236,7 +1236,7 @@ static void setup_frame_size(VP10_COMMON *cm, struct vpx_read_bit_buffer *rb) { ...@@ -1236,7 +1236,7 @@ static void setup_frame_size(VP10_COMMON *cm, struct vpx_read_bit_buffer *rb) {
setup_display_size(cm, rb); setup_display_size(cm, rb);
lock_buffer_pool(pool); lock_buffer_pool(pool);
if (vp9_realloc_frame_buffer( if (vpx_realloc_frame_buffer(
get_frame_new_buffer(cm), cm->width, cm->height, get_frame_new_buffer(cm), cm->width, cm->height,
cm->subsampling_x, cm->subsampling_y, cm->subsampling_x, cm->subsampling_y,
#if CONFIG_VP9_HIGHBITDEPTH #if CONFIG_VP9_HIGHBITDEPTH
...@@ -1317,7 +1317,7 @@ static void setup_frame_size_with_refs(VP10_COMMON *cm, ...@@ -1317,7 +1317,7 @@ static void setup_frame_size_with_refs(VP10_COMMON *cm,
setup_display_size(cm, rb); setup_display_size(cm, rb);
lock_buffer_pool(pool); lock_buffer_pool(pool);
if (vp9_realloc_frame_buffer( if (vpx_realloc_frame_buffer(
get_frame_new_buffer(cm), cm->width, cm->height, get_frame_new_buffer(cm), cm->width, cm->height,
cm->subsampling_x, cm->subsampling_y, cm->subsampling_x, cm->subsampling_y,
#if CONFIG_VP9_HIGHBITDEPTH #if CONFIG_VP9_HIGHBITDEPTH
......
...@@ -435,7 +435,7 @@ int vp10_denoiser_alloc(VP9_DENOISER *denoiser, int width, int height, ...@@ -435,7 +435,7 @@ int vp10_denoiser_alloc(VP9_DENOISER *denoiser, int width, int height,
assert(denoiser != NULL); assert(denoiser != NULL);
for (i = 0; i < MAX_REF_FRAMES; ++i) { 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, ssx, ssy,
#if CONFIG_VP9_HIGHBITDEPTH #if CONFIG_VP9_HIGHBITDEPTH
use_highbitdepth, use_highbitdepth,
...@@ -450,7 +450,7 @@ int vp10_denoiser_alloc(VP9_DENOISER *denoiser, int width, int height, ...@@ -450,7 +450,7 @@ int vp10_denoiser_alloc(VP9_DENOISER *denoiser, int width, int height,
#endif #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, ssx, ssy,
#if CONFIG_VP9_HIGHBITDEPTH #if CONFIG_VP9_HIGHBITDEPTH
use_highbitdepth, use_highbitdepth,
...@@ -476,9 +476,9 @@ void vp10_denoiser_free(VP9_DENOISER *denoiser) { ...@@ -476,9 +476,9 @@ void vp10_denoiser_free(VP9_DENOISER *denoiser) {
return; return;
} }
for (i = 0; i < MAX_REF_FRAMES; ++i) { 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 #ifdef OUTPUT_YUV_DENOISED
......
...@@ -382,10 +382,10 @@ static void dealloc_compressor_data(VP10_COMP *cpi) { ...@@ -382,10 +382,10 @@ static void dealloc_compressor_data(VP10_COMP *cpi) {
#endif #endif
vp10_free_context_buffers(cm); vp10_free_context_buffers(cm);
vp9_free_frame_buffer(&cpi->last_frame_uf); vpx_free_frame_buffer(&cpi->last_frame_uf);
vp9_free_frame_buffer(&cpi->scaled_source); vpx_free_frame_buffer(&cpi->scaled_source);
vp9_free_frame_buffer(&cpi->scaled_last_source); vpx_free_frame_buffer(&cpi->scaled_last_source);
vp9_free_frame_buffer(&cpi->alt_ref_buffer); vpx_free_frame_buffer(&cpi->alt_ref_buffer);
vp10_lookahead_destroy(cpi->lookahead); vp10_lookahead_destroy(cpi->lookahead);
vpx_free(cpi->tile_tok[0][0]); vpx_free(cpi->tile_tok[0][0]);
...@@ -406,12 +406,12 @@ static void dealloc_compressor_data(VP10_COMP *cpi) { ...@@ -406,12 +406,12 @@ static void dealloc_compressor_data(VP10_COMP *cpi) {
} }
for (i = 0; i < MAX_LAG_BUFFERS; ++i) { 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, memset(&cpi->svc.scaled_frames[0], 0,
MAX_LAG_BUFFERS * sizeof(cpi->svc.scaled_frames[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)); memset(&cpi->svc.empty_frame, 0, sizeof(cpi->svc.empty_frame));
} }
...@@ -628,7 +628,7 @@ static void alloc_raw_frame_buffers(VP10_COMP *cpi) { ...@@ -628,7 +628,7 @@ static void alloc_raw_frame_buffers(VP10_COMP *cpi) {
"Failed to allocate lag buffers"); "Failed to allocate lag buffers");
// TODO(agrange) Check if ARF is enabled and skip allocation if not. // 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, oxcf->width, oxcf->height,
cm->subsampling_x, cm->subsampling_y, cm->subsampling_x, cm->subsampling_y,
#if CONFIG_VP9_HIGHBITDEPTH #if CONFIG_VP9_HIGHBITDEPTH
...@@ -642,7 +642,7 @@ static void alloc_raw_frame_buffers(VP10_COMP *cpi) { ...@@ -642,7 +642,7 @@ static void alloc_raw_frame_buffers(VP10_COMP *cpi) {
static void alloc_util_frame_buffers(VP10_COMP *cpi) { static void alloc_util_frame_buffers(VP10_COMP *cpi) {
VP10_COMMON *const cm = &cpi->common; 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->width, cm->height,
cm->subsampling_x, cm->subsampling_y, cm->subsampling_x, cm->subsampling_y,
#if CONFIG_VP9_HIGHBITDEPTH #if CONFIG_VP9_HIGHBITDEPTH
...@@ -653,7 +653,7 @@ static void alloc_util_frame_buffers(VP10_COMP *cpi) { ...@@ -653,7 +653,7 @@ static void alloc_util_frame_buffers(VP10_COMP *cpi) {
vpx_internal_error(&cm->error, VPX_CODEC_MEM_ERROR, vpx_internal_error(&cm->error, VPX_CODEC_MEM_ERROR,
"Failed to allocate last frame buffer"); "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->width, cm->height,
cm->subsampling_x, cm->subsampling_y, cm->subsampling_x, cm->subsampling_y,
#if CONFIG_VP9_HIGHBITDEPTH #if CONFIG_VP9_HIGHBITDEPTH
...@@ -664,7 +664,7 @@ static void alloc_util_frame_buffers(VP10_COMP *cpi) { ...@@ -664,7 +664,7 @@ static void alloc_util_frame_buffers(VP10_COMP *cpi) {
vpx_internal_error(&cm->error, VPX_CODEC_MEM_ERROR, vpx_internal_error(&cm->error, VPX_CODEC_MEM_ERROR,
"Failed to allocate scaled source buffer"); "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->width, cm->height,
cm->subsampling_x, cm->subsampling_y, cm->subsampling_x, cm->subsampling_y,
#if CONFIG_VP9_HIGHBITDEPTH #if CONFIG_VP9_HIGHBITDEPTH
...@@ -743,7 +743,7 @@ static void update_frame_size(VP10_COMP *cpi) { ...@@ -743,7 +743,7 @@ static void update_frame_size(VP10_COMP *cpi) {
set_tile_limits(cpi); set_tile_limits(cpi);
if (is_two_pass_svc(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->width, cm->height,
cm->subsampling_x, cm->subsampling_y, cm->subsampling_x, cm->subsampling_y,
#if CONFIG_VP9_HIGHBITDEPTH #if CONFIG_VP9_HIGHBITDEPTH
...@@ -2548,7 +2548,7 @@ static void scale_and_extend_frame_nonnormative(const YV12_BUFFER_CONFIG *src, ...@@ -2548,7 +2548,7 @@ static void scale_and_extend_frame_nonnormative(const YV12_BUFFER_CONFIG *src,
dsts[i], dst_heights[i], dst_widths[i], dst_strides[i]); dsts[i], dst_heights[i], dst_widths[i], dst_strides[i]);
#endif // CONFIG_VP9_HIGHBITDEPTH #endif // CONFIG_VP9_HIGHBITDEPTH
} }
vp9_extend_frame_borders(dst); vpx_extend_frame_borders(dst);
} }
#if CONFIG_VP9_HIGHBITDEPTH #if CONFIG_VP9_HIGHBITDEPTH
...@@ -2603,7 +2603,7 @@ static void scale_and_extend_frame(const YV12_BUFFER_CONFIG *src, ...@@ -2603,7 +2603,7 @@ static void scale_and_extend_frame(const YV12_BUFFER_CONFIG *src,
} }
} }
vp9_extend_frame_borders(dst); vpx_extend_frame_borders(dst);
} }
static int scale_down(VP10_COMP *cpi, int q) { static int scale_down(VP10_COMP *cpi, int q) {
...@@ -2769,7 +2769,7 @@ static void loopfilter_frame(VP10_COMP *cpi, VP10_COMMON *cm) { ...@@ -2769,7 +2769,7 @@ static void loopfilter_frame(VP10_COMP *cpi, VP10_COMMON *cm) {
vp10_loop_filter_frame(cm->frame_to_show, cm, xd, lf->filter_level, 0, 0); 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, static INLINE void alloc_frame_mvs(const VP10_COMMON *cm,
...@@ -2819,7 +2819,7 @@ void vp10_scale_references(VP10_COMP *cpi) { ...@@ -2819,7 +2819,7 @@ void vp10_scale_references(VP10_COMP *cpi) {
if (force_scaling || if (force_scaling ||
new_fb_ptr->buf.y_crop_width != cm->width || new_fb_ptr->buf.y_crop_width != cm->width ||
new_fb_ptr->buf.y_crop_height != cm->height) { 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->width, cm->height,
cm->subsampling_x, cm->subsampling_y, cm->subsampling_x, cm->subsampling_y,
cm->use_highbitdepth, cm->use_highbitdepth,
...@@ -2844,7 +2844,7 @@ void vp10_scale_references(VP10_COMP *cpi) { ...@@ -2844,7 +2844,7 @@ void vp10_scale_references(VP10_COMP *cpi) {
if (force_scaling || if (force_scaling ||
new_fb_ptr->buf.y_crop_width != cm->width || new_fb_ptr->buf.y_crop_width != cm->width ||
new_fb_ptr->buf.y_crop_height != cm->height) { 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->width, cm->height,
cm->subsampling_x, cm->subsampling_y, cm->subsampling_x, cm->subsampling_y,
VP9_ENC_BORDER_IN_PIXELS, cm->byte_alignment, VP9_ENC_BORDER_IN_PIXELS, cm->byte_alignment,
...@@ -3139,7 +3139,7 @@ static void set_frame_size(VP10_COMP *cpi) { ...@@ -3139,7 +3139,7 @@ static void set_frame_size(VP10_COMP *cpi) {
alloc_frame_mvs(cm, cm->new_fb_idx); alloc_frame_mvs(cm, cm->new_fb_idx);
// Reset the frame pointers to the current frame size. // 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->width, cm->height,
cm->subsampling_x, cm->subsampling_y, cm->subsampling_x, cm->subsampling_y,
#if CONFIG_VP9_HIGHBITDEPTH #if CONFIG_VP9_HIGHBITDEPTH
...@@ -3172,7 +3172,7 @@ static void set_frame_size(VP10_COMP *cpi) { ...@@ -3172,7 +3172,7 @@ static void set_frame_size(VP10_COMP *cpi) {
cm->width, cm->height); cm->width, cm->height);
#endif // CONFIG_VP9_HIGHBITDEPTH #endif // CONFIG_VP9_HIGHBITDEPTH
if (vp10_is_scaled(&ref_buf->sf)) if (vp10_is_scaled(&ref_buf->sf))
vp9_extend_frame_borders(buf); vpx_extend_frame_borders(buf);
} else { } else {
ref_buf->buf = NULL; ref_buf->buf = NULL;
} }
...@@ -3563,7 +3563,7 @@ YV12_BUFFER_CONFIG *vp10_scale_if_required_fast(VP10_COMMON *cm, ...@@ -3563,7 +3563,7 @@ YV12_BUFFER_CONFIG *vp10_scale_if_required_fast(VP10_COMMON *cm,
// For 2x2 scaling down. // For 2x2 scaling down.
vpx_scale_frame(unscaled, scaled, unscaled->y_buffer, 9, 2, 1, vpx_scale_frame(unscaled, scaled, unscaled->y_buffer, 9, 2, 1,
2, 1, 0); 2, 1, 0);
vp9_extend_frame_borders(scaled); vpx_extend_frame_borders(scaled);
return scaled; return scaled;
} else { } else {
return unscaled; return unscaled;
...@@ -4179,7 +4179,7 @@ int vp10_get_compressed_data(VP10_COMP *cpi, unsigned int *frame_flags, ...@@ -4179,7 +4179,7 @@ int vp10_get_compressed_data(VP10_COMP *cpi, unsigned int *frame_flags,
if (oxcf->arnr_max_frames > 0) { if (oxcf->arnr_max_frames > 0) {
// Produce the filtered ARF frame. // Produce the filtered ARF frame.
vp10_temporal_filter(cpi, arf_src_index); 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; force_src_buffer = &cpi->alt_ref_buffer;
} }
...@@ -4386,7 +4386,7 @@ int vp10_get_compressed_data(VP10_COMP *cpi, unsigned int *frame_flags, ...@@ -4386,7 +4386,7 @@ int vp10_get_compressed_data(VP10_COMP *cpi, unsigned int *frame_flags,
PSNR_STATS psnr2; PSNR_STATS psnr2;
double frame_ssim2 = 0, weight = 0; double frame_ssim2 = 0, weight = 0;
#if CONFIG_VP9_POSTPROC #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, recon->y_crop_width, recon->y_crop_height,
cm->subsampling_x, cm->subsampling_y, cm->subsampling_x, cm->subsampling_y,
#if CONFIG_VP9_HIGHBITDEPTH #if CONFIG_VP9_HIGHBITDEPTH
......
...@@ -1114,7 +1114,7 @@ void vp10_first_pass(VP10_COMP *cpi, const struct lookahead_entry *source) { ...@@ -1114,7 +1114,7 @@ void vp10_first_pass(VP10_COMP *cpi, const struct lookahead_entry *source) {
++twopass->sr_update_lag; ++twopass->sr_update_lag;
} }
vp9_extend_frame_borders(new_yv12); vpx_extend_frame_borders(new_yv12);
if (lc != NULL) { if (lc != NULL) {
vp10_update_reference_frames(cpi); vp10_update_reference_frames(cpi);
......
...@@ -38,7 +38,7 @@ void vp10_lookahead_destroy(struct lookahead_ctx *ctx) { ...@@ -38,7 +38,7 @@ void vp10_lookahead_destroy(struct lookahead_ctx *ctx) {
unsigned int i; unsigned int i;
for (i = 0; i < ctx->max_sz; 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->buf);
} }
free(ctx); free(ctx);
...@@ -72,7 +72,7 @@ struct lookahead_ctx *vp10_lookahead_init(unsigned int width, ...@@ -72,7 +72,7 @@ struct lookahead_ctx *vp10_lookahead_init(unsigned int width,
if (!ctx->buf) if (!ctx->buf)
goto bail; goto bail;
for (i = 0; i < depth; i++) 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, width, height, subsampling_x, subsampling_y,
#if CONFIG_VP9_HIGHBITDEPTH #if CONFIG_VP9_HIGHBITDEPTH
use_highbitdepth, use_highbitdepth,
...@@ -172,7 +172,7 @@ int vp10_lookahead_push(struct lookahead_ctx *ctx, YV12_BUFFER_CONFIG *src, ...@@ -172,7 +172,7 @@ int vp10_lookahead_push(struct lookahead_ctx *ctx, YV12_BUFFER_CONFIG *src,
if (larger_dimensions) { if (larger_dimensions) {
YV12_BUFFER_CONFIG new_img; YV12_BUFFER_CONFIG new_img;
memset(&new_img, 0, sizeof(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, width, height, subsampling_x, subsampling_y,
#if CONFIG_VP9_HIGHBITDEPTH #if CONFIG_VP9_HIGHBITDEPTH
use_highbitdepth, use_highbitdepth,
...@@ -180,7 +180,7 @@ int vp10_lookahead_push(struct lookahead_ctx *ctx, YV12_BUFFER_CONFIG *src, ...@@ -180,7 +180,7 @@ int vp10_lookahead_push(struct lookahead_ctx *ctx, YV12_BUFFER_CONFIG *src,
VP9_ENC_BORDER_IN_PIXELS, VP9_ENC_BORDER_IN_PIXELS,
0)) 0))
return 1; return 1;
vp9_free_frame_buffer(&buf->img); vpx_free_frame_buffer(&buf->img);
buf->img = new_img; buf->img = new_img;
} else if (new_dimensions) { } else if (new_dimensions) {
buf->img.y_crop_width = src->y_crop_width; buf->img.y_crop_width = src->y_crop_width;
......
...@@ -61,10 +61,10 @@ void vp10_compute_skin_map(VP10_COMP *const cpi, FILE *yuv_skinmap_file) { ...@@ -61,10 +61,10 @@ void vp10_compute_skin_map(VP10_COMP *const cpi, FILE *yuv_skinmap_file) {
const int src_uvstride = cpi->Source->uv_stride; const int src_uvstride = cpi->Source->uv_stride;
YV12_BUFFER_CONFIG skinmap; YV12_BUFFER_CONFIG skinmap;
memset(&skinmap, 0, sizeof(YV12_BUFFER_CONFIG)); 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, cm->subsampling_x, cm->subsampling_y,
VP9_ENC_BORDER_IN_PIXELS, cm->byte_alignment)) { VP9_ENC_BORDER_IN_PIXELS, cm->byte_alignment)) {
vp9_free_frame_buffer(&skinmap); vpx_free_frame_buffer(&skinmap);
return; return;
} }
memset(skinmap.buffer_alloc, 128, skinmap.frame_size); memset(skinmap.buffer_alloc, 128, skinmap.frame_size);
...@@ -99,6 +99,6 @@ void vp10_compute_skin_map(VP10_COMP *const cpi, FILE *yuv_skinmap_file) { ...@@ -99,6 +99,6 @@ void vp10_compute_skin_map(VP10_COMP *const cpi, FILE *yuv_skinmap_file) {
src_v += (src_uvstride << 2) - ((cm->mi_cols - 1) << 2); src_v += (src_uvstride << 2) - ((cm->mi_cols - 1) << 2);
} }
vp10_write_yuv_frame_420(&skinmap, yuv_skinmap_file); vp10_write_yuv_frame_420(&skinmap, yuv_skinmap_file);
vp9_free_frame_buffer(&skinmap); vpx_free_frame_buffer(&skinmap);
} }
#endif #endif
...@@ -28,7 +28,7 @@ void vp10_init_layer_context(VP10_COMP *const cpi) { ...@@ -28,7 +28,7 @@ void vp10_init_layer_context(VP10_COMP *const cpi) {
svc->temporal_layer_id = 0; svc->temporal_layer_id = 0;
if (cpi->oxcf.error_resilient_mode == 0 && cpi->oxcf.pass == 2) { 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, SMALL_FRAME_WIDTH, SMALL_FRAME_HEIGHT,
cpi->common.subsampling_x, cpi->common.subsampling_x,
cpi->common.subsampling_y, cpi->common.subsampling_y,
......
...@@ -705,7 +705,7 @@ void vp10_temporal_filter(VP10_COMP *cpi, int distance) { ...@@ -705,7 +705,7 @@ void vp10_temporal_filter(VP10_COMP *cpi, int distance) {
for (frame = 0; frame < frames_to_blur; ++frame) { for (frame = 0; frame < frames_to_blur; ++frame) {
if (cm->mi_cols * MI_SIZE != frames[frame]->y_width || if (cm->mi_cols * MI_SIZE != frames[frame]->y_width ||
cm->mi_rows * MI_SIZE != frames[frame]->y_height) { 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->width, cm->height,
cm->subsampling_x, cm->subsampling_y, cm->subsampling_x, cm->subsampling_y,
#if CONFIG_VP9_HIGHBITDEPTH #if CONFIG_VP9_HIGHBITDEPTH
......
...@@ -95,14 +95,14 @@ void vp9_free_ref_frame_buffers(BufferPool *pool) { ...@@ -95,14 +95,14 @@ void vp9_free_ref_frame_buffers(BufferPool *pool) {
} }
vpx_free(pool->frame_bufs[i].mvs); vpx_free(pool->frame_bufs[i].mvs);
pool->frame_bufs[i].mvs = NULL; 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) { void vp9_free_postproc_buffers(VP9_COMMON *cm) {
#if CONFIG_VP9_POSTPROC #if CONFIG_VP9_POSTPROC
vp9_free_frame_buffer(&cm->post_proc_buffer); vpx_free_frame_buffer(&cm->post_proc_buffer);
vp9_free_frame_buffer(&cm->post_proc_buffer_int); vpx_free_frame_buffer(&cm->post_proc_buffer_int);
#else #else
(void)cm; (void)cm;
#endif #endif
......
...@@ -659,7 +659,7 @@ int vp9_post_proc_frame(struct VP9Common *cm, ...@@ -659,7 +659,7 @@ int vp9_post_proc_frame(struct VP9Common *cm,
const int width = ALIGN_POWER_OF_TWO(cm->width, 4); const int width = ALIGN_POWER_OF_TWO(cm->width, 4);
const int height = ALIGN_POWER_OF_TWO(cm->height, 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, cm->subsampling_x, cm->subsampling_y,
#if CONFIG_VP9_HIGHBITDEPTH #if CONFIG_VP9_HIGHBITDEPTH
cm->use_highbitdepth, cm->use_highbitdepth,
...@@ -677,7 +677,7 @@ int vp9_post_proc_frame(struct VP9Common *cm, ...@@ -677,7 +677,7 @@ int vp9_post_proc_frame(struct VP9Common *cm,
} }
} }
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, cm->subsampling_x, cm->subsampling_y,
#if CONFIG_VP9_HIGHBITDEPTH #if CONFIG_VP9_HIGHBITDEPTH
cm->use_highbitdepth, cm->use_highbitdepth,
......
...@@ -1235,7 +1235,7 @@ static void setup_frame_size(VP9_COMMON *cm, struct vpx_read_bit_buffer *rb) { ...@@ -1235,7 +1235,7 @@ static void setup_frame_size(VP9_COMMON *cm, struct vpx_read_bit_buffer *rb) {
setup_display_size(cm, rb); setup_display_size(cm, rb);
lock_buffer_pool(pool); lock_buffer_pool(pool);
if (vp9_realloc_frame_buffer( if (vpx_realloc_frame_buffer(
get_frame_new_buffer(cm), cm->width, cm->height, get_frame_new_buffer(cm), cm->width, cm->height,
cm->subsampling_x, cm->subsampling_y, cm->subsampling_x, cm->subsampling_y,
#if CONFIG_VP9_HIGHBITDEPTH #if CONFIG_VP9_HIGHBITDEPTH
...@@ -1316,7 +1316,7 @@ static void setup_frame_size_with_refs(VP9_COMMON *cm, ...@@ -1316,7 +1316,7 @@ static void setup_frame_size_with_refs(VP9_COMMON *cm,
setup_display_size(cm, rb); setup_display_size(cm, rb);
lock_buffer_pool(pool); lock_buffer_pool(pool);
if (vp9_realloc_frame_buffer( if (vpx_realloc_frame_buffer(
get_frame_new_buffer(cm), cm->width, cm->height, get_frame_new_buffer(cm), cm->width, cm->height,
cm->subsampling_x, cm->subsampling_y, cm->subsampling_x, cm->subsampling_y,
#if CONFIG_VP9_HIGHBITDEPTH #if CONFIG_VP9_HIGHBITDEPTH
......
...@@ -431,7 +431,7 @@ int vp9_denoiser_alloc(VP9_DENOISER *denoiser, int width, int height, ...@@ -431,7 +431,7 @@ int vp9_denoiser_alloc(VP9_DENOISER *denoiser, int width, int height,
assert(denoiser != NULL); assert(denoiser != NULL);
for (i = 0; i < MAX_REF_FRAMES; ++i) { 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, ssx, ssy,
#if CONFIG_VP9_HIGHBITDEPTH #if CONFIG_VP9_HIGHBITDEPTH
use_highbitdepth, use_highbitdepth,
...@@ -446,7 +446,7 @@ int vp9_denoiser_alloc(VP9_DENOISER *denoiser, int width, int height, ...@@ -446,7 +446,7 @@ int vp9_denoiser_alloc(VP9_DENOISER *denoiser, int width, int height,
#endif #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, ssx, ssy,
#if CONFIG_VP9_HIGHBITDEPTH #if CONFIG_VP9_HIGHBITDEPTH
use_highbitdepth, use_highbitdepth,
...@@ -472,9 +472,9 @@ void vp9_denoiser_free(VP9_DENOISER *denoiser) { ...@@ -472,9 +472,9 @@ void vp9_denoiser_free(VP9_DENOISER *denoiser) {
return; return;
} }
for (i = 0; i < MAX_REF_FRAMES; ++i) { 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 #ifdef OUTPUT_YUV_DENOISED