Skip to content
GitLab
Commit d7227958 authored by Yaowu Xu's avatar Yaowu Xu Committed by Gerrit Code Review
Browse files

vp9_rdopt.c: cleanup -wextra warnings 

Change-Id: I1f87c689cad2224181d40a7d00f5c1064ceefa4b
parent 1fe6496b
v1.14.0-linphone 1.4.X feature/update_to_v1.9.0-linphone feature/uwp_nuget frame_parallel highbitdepth indianrunnerduck javanwhistlingduck khakicampbell linphone linphone-android linphone-old longtailedduck m49-2623 m52-2743 m54-2840 m56-2924 m66-3359 m68-3440 mandarinduck nextgen nextgenv2 playground sandbox/Jingning/experimental sandbox/Jingning/transcode sandbox/Jingning/vpx sandbox/aconverse@google.com/ansbench sandbox/hkuang/frame_parallel sandbox/hkuang@google.com/decode sandbox/jimbankoski@google.com/proposed-aom sandbox/jingning@google.com/decoder_test_suite sandbox/jingning@google.com/experimental sandbox/jzern@google.com/test sandbox/wangch@google.com/vp9 sandbox/yaowu@google.com/mergeaom v1.12.0-linphone v1.6.1_linphone v1.7.0-linphone v1.9.0-linphone v1.9.0 v1.9.0-rc1 v1.8.2 v1.8.1 v1.8.0 v1.7.0 v1.6.1 v1.6.0 v1.5.0 v1.4.0
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 7 additions and 5 deletions
vp9/encoder/vp9_rdopt.c
+ 7
− 5
View file @ d7227958
...@@ -745,7 +745,8 @@ static void txfm_rd_in_plane(MACROBLOCK *x, ...@@ -745,7 +745,8 @@ static void txfm_rd_in_plane(MACROBLOCK *x,
int use_fast_coef_casting) { int use_fast_coef_casting) {
MACROBLOCKD *const xd = &x->e_mbd; MACROBLOCKD *const xd = &x->e_mbd;
const struct macroblockd_plane *const pd = &xd->plane[plane]; const struct macroblockd_plane *const pd = &xd->plane[plane];
struct rdcost_block_args args = { 0 }; struct rdcost_block_args args;
vp9_zero(args);
args.x = x; args.x = x;
args.best_rd = ref_best_rd; args.best_rd = ref_best_rd;
args.use_fast_coef_costing = use_fast_coef_casting; args.use_fast_coef_costing = use_fast_coef_casting;
...@@ -2311,7 +2312,7 @@ static void single_motion_search(VP9_COMP *cpi, MACROBLOCK *x, ...@@ -2311,7 +2312,7 @@ static void single_motion_search(VP9_COMP *cpi, MACROBLOCK *x,
MACROBLOCKD *xd = &x->e_mbd; MACROBLOCKD *xd = &x->e_mbd;
const VP9_COMMON *cm = &cpi->common; const VP9_COMMON *cm = &cpi->common;
MB_MODE_INFO *mbmi = &xd->mi[0]->mbmi; MB_MODE_INFO *mbmi = &xd->mi[0]->mbmi;
struct buf_2d backup_yv12[MAX_MB_PLANE] = {{0}}; struct buf_2d backup_yv12[MAX_MB_PLANE] = {{0, 0}};
int bestsme = INT_MAX; int bestsme = INT_MAX;
int step_param; int step_param;
int sadpb = x->sadperbit16; int sadpb = x->sadperbit16;
...@@ -3067,7 +3068,7 @@ int64_t vp9_rd_pick_inter_mode_sb(VP9_COMP *cpi, MACROBLOCK *x, ...@@ -3067,7 +3068,7 @@ int64_t vp9_rd_pick_inter_mode_sb(VP9_COMP *cpi, MACROBLOCK *x,
int64_t best_pred_rd[REFERENCE_MODES]; int64_t best_pred_rd[REFERENCE_MODES];
int64_t best_filter_rd[SWITCHABLE_FILTER_CONTEXTS]; int64_t best_filter_rd[SWITCHABLE_FILTER_CONTEXTS];
int64_t best_filter_diff[SWITCHABLE_FILTER_CONTEXTS]; int64_t best_filter_diff[SWITCHABLE_FILTER_CONTEXTS];
MB_MODE_INFO best_mbmode = { 0 }; MB_MODE_INFO best_mbmode;
int mode_index, best_mode_index = -1; int mode_index, best_mode_index = -1;
unsigned int ref_costs_single[MAX_REF_FRAMES], ref_costs_comp[MAX_REF_FRAMES]; unsigned int ref_costs_single[MAX_REF_FRAMES], ref_costs_comp[MAX_REF_FRAMES];
vp9_prob comp_mode_p; vp9_prob comp_mode_p;
...@@ -3093,7 +3094,7 @@ int64_t vp9_rd_pick_inter_mode_sb(VP9_COMP *cpi, MACROBLOCK *x, ...@@ -3093,7 +3094,7 @@ int64_t vp9_rd_pick_inter_mode_sb(VP9_COMP *cpi, MACROBLOCK *x,
const int intra_y_mode_mask = const int intra_y_mode_mask =
cpi->sf.intra_y_mode_mask[max_txsize_lookup[bsize]]; cpi->sf.intra_y_mode_mask[max_txsize_lookup[bsize]];
int disable_inter_mode_mask = cpi->sf.disable_inter_mode_mask[bsize]; int disable_inter_mode_mask = cpi->sf.disable_inter_mode_mask[bsize];
vp9_zero(best_mbmode);
x->skip_encode = cpi->sf.skip_encode_frame && x->q_index < QIDX_SKIP_THRESH; x->skip_encode = cpi->sf.skip_encode_frame && x->q_index < QIDX_SKIP_THRESH;
estimate_ref_frame_costs(cm, xd, segment_id, ref_costs_single, ref_costs_comp, estimate_ref_frame_costs(cm, xd, segment_id, ref_costs_single, ref_costs_comp,
...@@ -3676,7 +3677,7 @@ int64_t vp9_rd_pick_inter_mode_sub8x8(VP9_COMP *cpi, MACROBLOCK *x, ...@@ -3676,7 +3677,7 @@ int64_t vp9_rd_pick_inter_mode_sub8x8(VP9_COMP *cpi, MACROBLOCK *x,
int64_t best_pred_rd[REFERENCE_MODES]; int64_t best_pred_rd[REFERENCE_MODES];
int64_t best_filter_rd[SWITCHABLE_FILTER_CONTEXTS]; int64_t best_filter_rd[SWITCHABLE_FILTER_CONTEXTS];
int64_t best_filter_diff[SWITCHABLE_FILTER_CONTEXTS]; int64_t best_filter_diff[SWITCHABLE_FILTER_CONTEXTS];
MB_MODE_INFO best_mbmode = { 0 }; MB_MODE_INFO best_mbmode;
int ref_index, best_ref_index = 0; int ref_index, best_ref_index = 0;
unsigned int ref_costs_single[MAX_REF_FRAMES], ref_costs_comp[MAX_REF_FRAMES]; unsigned int ref_costs_single[MAX_REF_FRAMES], ref_costs_comp[MAX_REF_FRAMES];
vp9_prob comp_mode_p; vp9_prob comp_mode_p;
...@@ -3696,6 +3697,7 @@ int64_t vp9_rd_pick_inter_mode_sub8x8(VP9_COMP *cpi, MACROBLOCK *x, ...@@ -3696,6 +3697,7 @@ int64_t vp9_rd_pick_inter_mode_sub8x8(VP9_COMP *cpi, MACROBLOCK *x,
x->skip_encode = cpi->sf.skip_encode_frame && x->q_index < QIDX_SKIP_THRESH; x->skip_encode = cpi->sf.skip_encode_frame && x->q_index < QIDX_SKIP_THRESH;
vpx_memset(x->zcoeff_blk[TX_4X4], 0, 4); vpx_memset(x->zcoeff_blk[TX_4X4], 0, 4);
vp9_zero(best_mbmode);
for (i = 0; i < 4; i++) { for (i = 0; i < 4; i++) {
int j; int j;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment