diff options
| author | Jerome Jiang <jianj@google.com> | 2023-05-04 10:32:03 -0400 |
|---|---|---|
| committer | Jerome Jiang <jianj@google.com> | 2023-05-04 10:33:07 -0400 |
| commit | f059f9ee2df114ffa475aaef064f93396ebf39cc (patch) | |
| tree | be724e95eebdd936144bd0aa15bc1f366d36502d /vp9 | |
| parent | 4dd3afc00eb0c9d74dfa18bb8e727dbfb98e92ff (diff) | |
| download | libvpx-f059f9ee2df114ffa475aaef064f93396ebf39cc.tar libvpx-f059f9ee2df114ffa475aaef064f93396ebf39cc.tar.gz libvpx-f059f9ee2df114ffa475aaef064f93396ebf39cc.tar.bz2 libvpx-f059f9ee2df114ffa475aaef064f93396ebf39cc.zip | |
Add Vpx* prefix to Tpl{Block,Frame}Stats
This is to avoid symbols redifinition when integrating with other
libraries.
Bug: b/273736974
Change-Id: I891af78b1907504d5bb9f735164aea18c2aba944
Diffstat (limited to 'vp9')
| -rw-r--r-- | vp9/encoder/vp9_encoder.h | 2 | ||||
| -rw-r--r-- | vp9/encoder/vp9_tpl_model.c | 8 | ||||
| -rw-r--r-- | vp9/vp9_cx_iface.c | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/vp9/encoder/vp9_encoder.h b/vp9/encoder/vp9_encoder.h index 742cf0b6d..cca161783 100644 --- a/vp9/encoder/vp9_encoder.h +++ b/vp9/encoder/vp9_encoder.h @@ -745,7 +745,7 @@ typedef struct VP9_COMP { BLOCK_SIZE tpl_bsize; TplDepFrame tpl_stats[MAX_ARF_GOP_SIZE]; // Used to store TPL stats before propagation - TplFrameStats tpl_frame_stats[MAX_ARF_GOP_SIZE]; + VpxTplFrameStats tpl_frame_stats[MAX_ARF_GOP_SIZE]; YV12_BUFFER_CONFIG *tpl_recon_frames[REF_FRAMES]; EncFrameBuf enc_frame_buf[REF_FRAMES]; #if CONFIG_MULTITHREAD diff --git a/vp9/encoder/vp9_tpl_model.c b/vp9/encoder/vp9_tpl_model.c index b62c66b6c..ea5d61e32 100644 --- a/vp9/encoder/vp9_tpl_model.c +++ b/vp9/encoder/vp9_tpl_model.c @@ -154,7 +154,7 @@ static void init_tpl_stats(VP9_COMP *cpi) { int frame_idx; for (frame_idx = 0; frame_idx < MAX_ARF_GOP_SIZE; ++frame_idx) { TplDepFrame *tpl_frame = &cpi->tpl_stats[frame_idx]; - TplFrameStats *tpl_frame_stats = &cpi->tpl_frame_stats[frame_idx]; + VpxTplFrameStats *tpl_frame_stats = &cpi->tpl_frame_stats[frame_idx]; memset(tpl_frame->tpl_stats_ptr, 0, tpl_frame->height * tpl_frame->width * sizeof(*tpl_frame->tpl_stats_ptr)); @@ -356,7 +356,7 @@ static void tpl_model_store(TplDepStats *tpl_stats, int mi_row, int mi_col, } } -static void tpl_store_before_propagation(TplBlockStats *tpl_block_stats, +static void tpl_store_before_propagation(VpxTplBlockStats *tpl_block_stats, TplDepStats *tpl_stats, int mi_row, int mi_col, BLOCK_SIZE bsize, int stride, int64_t recon_error, @@ -368,7 +368,7 @@ static void tpl_store_before_propagation(TplBlockStats *tpl_block_stats, for (idy = 0; idy < mi_height; ++idy) { for (idx = 0; idx < mi_width; ++idx) { - TplBlockStats *tpl_block_stats_ptr = + VpxTplBlockStats *tpl_block_stats_ptr = &tpl_block_stats[(mi_row + idy) * stride + mi_col + idx]; tpl_block_stats_ptr->inter_cost = src_stats->inter_cost; tpl_block_stats_ptr->intra_cost = src_stats->intra_cost; @@ -1105,7 +1105,7 @@ static void build_motion_field( static void mc_flow_dispenser(VP9_COMP *cpi, GF_PICTURE *gf_picture, int frame_idx, BLOCK_SIZE bsize) { TplDepFrame *tpl_frame = &cpi->tpl_stats[frame_idx]; - TplFrameStats *tpl_frame_stats_before_propagation = + VpxTplFrameStats *tpl_frame_stats_before_propagation = &cpi->tpl_frame_stats[frame_idx]; YV12_BUFFER_CONFIG *this_frame = gf_picture[frame_idx].frame; YV12_BUFFER_CONFIG *ref_frame[MAX_INTER_REF_FRAMES] = { NULL, NULL, NULL }; diff --git a/vp9/vp9_cx_iface.c b/vp9/vp9_cx_iface.c index 8bd880c7b..66efba181 100644 --- a/vp9/vp9_cx_iface.c +++ b/vp9/vp9_cx_iface.c @@ -1791,7 +1791,7 @@ static vpx_codec_err_t ctrl_get_svc_ref_frame_config(vpx_codec_alg_priv_t *ctx, static vpx_codec_err_t ctrl_get_tpl_stats(vpx_codec_alg_priv_t *ctx, va_list args) { VP9_COMP *const cpi = ctx->cpi; - TplFrameStats *data = va_arg(args, TplFrameStats *); + VpxTplFrameStats *data = va_arg(args, VpxTplFrameStats *); int i; if (data == NULL) { return VPX_CODEC_INVALID_PARAM; |