From 89af744ba6450daa55d2985c826fa58c8317e8d8 Mon Sep 17 00:00:00 2001 From: Jingning Han Date: Fri, 14 Aug 2015 15:27:02 -0700 Subject: [PATCH] Change vp9_ prefix function names in vpx_scale to vpx_ Change-Id: Iac85902cbbb3e752801dc85de9a3c778e47304aa --- vp10/common/alloccommon.c | 6 ++--- vp10/common/postproc.c | 4 ++-- vp10/decoder/decodeframe.c | 4 ++-- vp10/encoder/denoiser.c | 8 +++---- vp10/encoder/encoder.c | 42 ++++++++++++++++----------------- vp10/encoder/firstpass.c | 2 +- vp10/encoder/lookahead.c | 8 +++---- vp10/encoder/skin_detection.c | 6 ++--- vp10/encoder/svc_layercontext.c | 2 +- vp10/encoder/temporal_filter.c | 2 +- vp9/common/vp9_alloccommon.c | 6 ++--- vp9/common/vp9_postproc.c | 4 ++-- vp9/decoder/vp9_decodeframe.c | 4 ++-- vp9/encoder/vp9_denoiser.c | 8 +++---- vp9/encoder/vp9_encoder.c | 42 ++++++++++++++++----------------- vp9/encoder/vp9_firstpass.c | 2 +- vp9/encoder/vp9_lookahead.c | 8 +++---- vp9/encoder/vp9_skin_detection.c | 6 ++--- vp9/encoder/vp9_svc_layercontext.c | 2 +- vp9/encoder/vp9_temporal_filter.c | 2 +- vpx_scale/generic/yv12config.c | 10 ++++---- vpx_scale/generic/yv12extend.c | 4 ++-- vpx_scale/mips/dspr2/yv12extend_dspr2.c | 4 ++-- vpx_scale/vpx_scale_rtcd.pl | 8 +++---- vpx_scale/yv12config.h | 6 ++--- 25 files changed, 100 insertions(+), 100 deletions(-) diff --git a/vp10/common/alloccommon.c b/vp10/common/alloccommon.c index ecb10de..9ca86e5 100644 --- a/vp10/common/alloccommon.c +++ b/vp10/common/alloccommon.c @@ -77,14 +77,14 @@ void vp10_free_ref_frame_buffers(BufferPool *pool) { } 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 diff --git a/vp10/common/postproc.c b/vp10/common/postproc.c index 7112506..2d5b36a 100644 --- a/vp10/common/postproc.c +++ b/vp10/common/postproc.c @@ -659,7 +659,7 @@ int vp10_post_proc_frame(struct VP10Common *cm, 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 @@ 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, #if CONFIG_VP9_HIGHBITDEPTH cm->use_highbitdepth, diff --git a/vp10/decoder/decodeframe.c b/vp10/decoder/decodeframe.c index f502077..eb0392a 100644 --- a/vp10/decoder/decodeframe.c +++ b/vp10/decoder/decodeframe.c @@ -1236,7 +1236,7 @@ static void setup_frame_size(VP10_COMMON *cm, struct vpx_read_bit_buffer *rb) { 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 @@ static void setup_frame_size_with_refs(VP10_COMMON *cm, 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 diff --git a/vp10/encoder/denoiser.c b/vp10/encoder/denoiser.c index 4a79b11..3c9d949 100644 --- a/vp10/encoder/denoiser.c +++ b/vp10/encoder/denoiser.c @@ -435,7 +435,7 @@ int vp10_denoiser_alloc(VP9_DENOISER *denoiser, int width, int height, 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 @@ int vp10_denoiser_alloc(VP9_DENOISER *denoiser, int width, int height, #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 @@ void vp10_denoiser_free(VP9_DENOISER *denoiser) { 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 diff --git a/vp10/encoder/encoder.c b/vp10/encoder/encoder.c index 1f7b8f7..44e07c1 100644 --- a/vp10/encoder/encoder.c +++ b/vp10/encoder/encoder.c @@ -382,10 +382,10 @@ static void dealloc_compressor_data(VP10_COMP *cpi) { #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 @@ static void dealloc_compressor_data(VP10_COMP *cpi) { } 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 @@ static void alloc_raw_frame_buffers(VP10_COMP *cpi) { "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_raw_frame_buffers(VP10_COMP *cpi) { 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 @@ static void alloc_util_frame_buffers(VP10_COMP *cpi) { 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 @@ static void alloc_util_frame_buffers(VP10_COMP *cpi) { 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 @@ static void update_frame_size(VP10_COMP *cpi) { 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 @@ static void scale_and_extend_frame_nonnormative(const YV12_BUFFER_CONFIG *src, 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 @@ 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) { @@ -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); } - 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 @@ void vp10_scale_references(VP10_COMP *cpi) { 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 @@ void vp10_scale_references(VP10_COMP *cpi) { 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 @@ static void set_frame_size(VP10_COMP *cpi) { 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 @@ static void set_frame_size(VP10_COMP *cpi) { 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 @@ YV12_BUFFER_CONFIG *vp10_scale_if_required_fast(VP10_COMMON *cm, // 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 @@ int vp10_get_compressed_data(VP10_COMP *cpi, unsigned int *frame_flags, 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 @@ int vp10_get_compressed_data(VP10_COMP *cpi, unsigned int *frame_flags, 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 diff --git a/vp10/encoder/firstpass.c b/vp10/encoder/firstpass.c index 48d9a70..dd58319 100644 --- a/vp10/encoder/firstpass.c +++ b/vp10/encoder/firstpass.c @@ -1114,7 +1114,7 @@ void vp10_first_pass(VP10_COMP *cpi, const struct lookahead_entry *source) { ++twopass->sr_update_lag; } - vp9_extend_frame_borders(new_yv12); + vpx_extend_frame_borders(new_yv12); if (lc != NULL) { vp10_update_reference_frames(cpi); diff --git a/vp10/encoder/lookahead.c b/vp10/encoder/lookahead.c index 5a76336..431c631 100644 --- a/vp10/encoder/lookahead.c +++ b/vp10/encoder/lookahead.c @@ -38,7 +38,7 @@ void vp10_lookahead_destroy(struct lookahead_ctx *ctx) { 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 @@ struct lookahead_ctx *vp10_lookahead_init(unsigned int width, 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 @@ int vp10_lookahead_push(struct lookahead_ctx *ctx, YV12_BUFFER_CONFIG *src, 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 @@ int vp10_lookahead_push(struct lookahead_ctx *ctx, YV12_BUFFER_CONFIG *src, 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; diff --git a/vp10/encoder/skin_detection.c b/vp10/encoder/skin_detection.c index 5923eca..9aac477 100644 --- a/vp10/encoder/skin_detection.c +++ b/vp10/encoder/skin_detection.c @@ -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; 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 @@ void vp10_compute_skin_map(VP10_COMP *const cpi, FILE *yuv_skinmap_file) { 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 diff --git a/vp10/encoder/svc_layercontext.c b/vp10/encoder/svc_layercontext.c index 8f49c6d..7a90036 100644 --- a/vp10/encoder/svc_layercontext.c +++ b/vp10/encoder/svc_layercontext.c @@ -28,7 +28,7 @@ void vp10_init_layer_context(VP10_COMP *const cpi) { 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, diff --git a/vp10/encoder/temporal_filter.c b/vp10/encoder/temporal_filter.c index 961e925..0c55577 100644 --- a/vp10/encoder/temporal_filter.c +++ b/vp10/encoder/temporal_filter.c @@ -705,7 +705,7 @@ void vp10_temporal_filter(VP10_COMP *cpi, int distance) { 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 diff --git a/vp9/common/vp9_alloccommon.c b/vp9/common/vp9_alloccommon.c index a3e01bf..ac417b6 100644 --- a/vp9/common/vp9_alloccommon.c +++ b/vp9/common/vp9_alloccommon.c @@ -95,14 +95,14 @@ void vp9_free_ref_frame_buffers(BufferPool *pool) { } 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 diff --git a/vp9/common/vp9_postproc.c b/vp9/common/vp9_postproc.c index 1843bb9..71ab861 100644 --- a/vp9/common/vp9_postproc.c +++ b/vp9/common/vp9_postproc.c @@ -659,7 +659,7 @@ int vp9_post_proc_frame(struct VP9Common *cm, 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 @@ 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, #if CONFIG_VP9_HIGHBITDEPTH cm->use_highbitdepth, diff --git a/vp9/decoder/vp9_decodeframe.c b/vp9/decoder/vp9_decodeframe.c index 58b79ea..fb7b3b8 100644 --- a/vp9/decoder/vp9_decodeframe.c +++ b/vp9/decoder/vp9_decodeframe.c @@ -1235,7 +1235,7 @@ static void setup_frame_size(VP9_COMMON *cm, struct vpx_read_bit_buffer *rb) { 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 @@ static void setup_frame_size_with_refs(VP9_COMMON *cm, 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 diff --git a/vp9/encoder/vp9_denoiser.c b/vp9/encoder/vp9_denoiser.c index 1f9a28c..5f99285 100644 --- a/vp9/encoder/vp9_denoiser.c +++ b/vp9/encoder/vp9_denoiser.c @@ -431,7 +431,7 @@ int vp9_denoiser_alloc(VP9_DENOISER *denoiser, int width, int height, 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 @@ int vp9_denoiser_alloc(VP9_DENOISER *denoiser, int width, int height, #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 @@ void vp9_denoiser_free(VP9_DENOISER *denoiser) { 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 diff --git a/vp9/encoder/vp9_encoder.c b/vp9/encoder/vp9_encoder.c index aae1e26..c67cb32 100644 --- a/vp9/encoder/vp9_encoder.c +++ b/vp9/encoder/vp9_encoder.c @@ -381,10 +381,10 @@ static void dealloc_compressor_data(VP9_COMP *cpi) { #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 @@ static void dealloc_compressor_data(VP9_COMP *cpi) { } 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 @@ static void alloc_raw_frame_buffers(VP9_COMP *cpi) { "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_raw_frame_buffers(VP9_COMP *cpi) { 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 @@ static void alloc_util_frame_buffers(VP9_COMP *cpi) { 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 @@ static void alloc_util_frame_buffers(VP9_COMP *cpi) { 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 @@ static void update_frame_size(VP9_COMP *cpi) { 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 @@ static void scale_and_extend_frame_nonnormative(const YV12_BUFFER_CONFIG *src, 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 @@ 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(VP9_COMP *cpi, int q) { @@ -2768,7 +2768,7 @@ static void loopfilter_frame(VP9_COMP *cpi, VP9_COMMON *cm) { 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 @@ void vp9_scale_references(VP9_COMP *cpi) { 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 @@ void vp9_scale_references(VP9_COMP *cpi) { 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 @@ static void set_frame_size(VP9_COMP *cpi) { 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 @@ static void set_frame_size(VP9_COMP *cpi) { 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 @@ YV12_BUFFER_CONFIG *vp9_scale_if_required_fast(VP9_COMMON *cm, // 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 @@ int vp9_get_compressed_data(VP9_COMP *cpi, unsigned int *frame_flags, 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 @@ int vp9_get_compressed_data(VP9_COMP *cpi, unsigned int *frame_flags, 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 diff --git a/vp9/encoder/vp9_firstpass.c b/vp9/encoder/vp9_firstpass.c index 3c25454..e0c5966 100644 --- a/vp9/encoder/vp9_firstpass.c +++ b/vp9/encoder/vp9_firstpass.c @@ -1112,7 +1112,7 @@ void vp9_first_pass(VP9_COMP *cpi, const struct lookahead_entry *source) { ++twopass->sr_update_lag; } - vp9_extend_frame_borders(new_yv12); + vpx_extend_frame_borders(new_yv12); if (lc != NULL) { vp9_update_reference_frames(cpi); diff --git a/vp9/encoder/vp9_lookahead.c b/vp9/encoder/vp9_lookahead.c index b8e2ca8..8787be8 100644 --- a/vp9/encoder/vp9_lookahead.c +++ b/vp9/encoder/vp9_lookahead.c @@ -38,7 +38,7 @@ void vp9_lookahead_destroy(struct lookahead_ctx *ctx) { 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 @@ struct lookahead_ctx *vp9_lookahead_init(unsigned int width, 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 @@ int vp9_lookahead_push(struct lookahead_ctx *ctx, YV12_BUFFER_CONFIG *src, 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 @@ int vp9_lookahead_push(struct lookahead_ctx *ctx, YV12_BUFFER_CONFIG *src, 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; diff --git a/vp9/encoder/vp9_skin_detection.c b/vp9/encoder/vp9_skin_detection.c index 1cb0662..398188b 100644 --- a/vp9/encoder/vp9_skin_detection.c +++ b/vp9/encoder/vp9_skin_detection.c @@ -61,10 +61,10 @@ void vp9_compute_skin_map(VP9_COMP *const cpi, FILE *yuv_skinmap_file) { 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 @@ void vp9_compute_skin_map(VP9_COMP *const cpi, FILE *yuv_skinmap_file) { 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 diff --git a/vp9/encoder/vp9_svc_layercontext.c b/vp9/encoder/vp9_svc_layercontext.c index 1b35ac9..38a3278 100644 --- a/vp9/encoder/vp9_svc_layercontext.c +++ b/vp9/encoder/vp9_svc_layercontext.c @@ -28,7 +28,7 @@ void vp9_init_layer_context(VP9_COMP *const cpi) { 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, diff --git a/vp9/encoder/vp9_temporal_filter.c b/vp9/encoder/vp9_temporal_filter.c index c4d66e0..439eac6 100644 --- a/vp9/encoder/vp9_temporal_filter.c +++ b/vp9/encoder/vp9_temporal_filter.c @@ -705,7 +705,7 @@ void vp9_temporal_filter(VP9_COMP *cpi, int distance) { 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 diff --git a/vpx_scale/generic/yv12config.c b/vpx_scale/generic/yv12config.c index 71906b8..7739218 100644 --- a/vpx_scale/generic/yv12config.c +++ b/vpx_scale/generic/yv12config.c @@ -117,7 +117,7 @@ int vp8_yv12_alloc_frame_buffer(YV12_BUFFER_CONFIG *ybf, #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 @@ int vp9_free_frame_buffer(YV12_BUFFER_CONFIG *ybf) { 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 @@ int vp9_realloc_frame_buffer(YV12_BUFFER_CONFIG *ybf, 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 vp9_alloc_frame_buffer(YV12_BUFFER_CONFIG *ybf, 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 diff --git a/vpx_scale/generic/yv12extend.c b/vpx_scale/generic/yv12extend.c index 07d24d7..65151ca 100644 --- a/vpx_scale/generic/yv12extend.c +++ b/vpx_scale/generic/yv12extend.c @@ -200,11 +200,11 @@ static void extend_frame(YV12_BUFFER_CONFIG *const ybf, int ext_size) { 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); diff --git a/vpx_scale/mips/dspr2/yv12extend_dspr2.c b/vpx_scale/mips/dspr2/yv12extend_dspr2.c index 19f84cb..aab4785 100644 --- a/vpx_scale/mips/dspr2/yv12extend_dspr2.c +++ b/vpx_scale/mips/dspr2/yv12extend_dspr2.c @@ -132,11 +132,11 @@ static void extend_frame(YV12_BUFFER_CONFIG *const ybf, int ext_size) { 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); diff --git a/vpx_scale/vpx_scale_rtcd.pl b/vpx_scale/vpx_scale_rtcd.pl index ab6de62..56b952b 100644 --- a/vpx_scale/vpx_scale_rtcd.pl +++ b/vpx_scale/vpx_scale_rtcd.pl @@ -23,10 +23,10 @@ add_proto qw/void vp8_yv12_copy_frame/, "const struct yv12_buffer_config *src_yb 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; diff --git a/vpx_scale/yv12config.h b/vpx_scale/yv12config.h index 76cf771..fd5d54b 100644 --- a/vpx_scale/yv12config.h +++ b/vpx_scale/yv12config.h @@ -69,7 +69,7 @@ int vp8_yv12_realloc_frame_buffer(YV12_BUFFER_CONFIG *ybf, 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 @@ int vp9_alloc_frame_buffer(YV12_BUFFER_CONFIG *ybf, // 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 @@ int vp9_realloc_frame_buffer(YV12_BUFFER_CONFIG *ybf, 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 } -- 2.7.4