diff options
| author | Jingning Han <jingning@google.com> | 2013-07-31 17:02:06 -0700 |
|---|---|---|
| committer | Jingning Han <jingning@google.com> | 2013-07-31 17:04:13 -0700 |
| commit | 12f5762756f90b04a23d25c29cb9866904fbde56 (patch) | |
| tree | 63c69f0494294648c35003c9fa1474f2e21380d5 /vp9 | |
| parent | 8259cdf298863f21bcbeda3aff1f669d1ee2f2d7 (diff) | |
| download | libvpx-12f5762756f90b04a23d25c29cb9866904fbde56.tar libvpx-12f5762756f90b04a23d25c29cb9866904fbde56.tar.gz libvpx-12f5762756f90b04a23d25c29cb9866904fbde56.tar.bz2 libvpx-12f5762756f90b04a23d25c29cb9866904fbde56.zip | |
Remove unnecessary arguments in rd_pick_ref_frame
This commit removes redundant arguments passing in the function of
rd_pick_reference_frame. This resolves the clang warnings about
potential use of uninitialized values.
Change-Id: Ic68f949a9f8fcd0a583786b0c75321104ea44739
Diffstat (limited to 'vp9')
| -rw-r--r-- | vp9/encoder/vp9_encodeframe.c | 22 |
1 files changed, 2 insertions, 20 deletions
diff --git a/vp9/encoder/vp9_encodeframe.c b/vp9/encoder/vp9_encodeframe.c index fb1b527f1..458da3f9c 100644 --- a/vp9/encoder/vp9_encodeframe.c +++ b/vp9/encoder/vp9_encodeframe.c @@ -1825,8 +1825,7 @@ static void rd_pick_partition(VP9_COMP *cpi, TOKENEXTRA **tp, int mi_row, } // Examines 64x64 block and chooses a best reference frame -static void rd_pick_reference_frame(VP9_COMP *cpi, TOKENEXTRA **tp, int mi_row, - int mi_col, int *rate, int64_t *dist) { +static void rd_pick_reference_frame(VP9_COMP *cpi, int mi_row, int mi_col) { VP9_COMMON * const cm = &cpi->common; MACROBLOCK * const x = &cpi->mb; MACROBLOCKD * const xd = &x->e_mbd; @@ -1857,23 +1856,7 @@ static void rd_pick_reference_frame(VP9_COMP *cpi, TOKENEXTRA **tp, int mi_row, cpi->set_ref_frame_mask = 0; } - *rate = r; - *dist = d; - // RDCOST(x->rdmult, x->rddiv, r, d) - restore_context(cpi, mi_row, mi_col, a, l, sa, sl, BLOCK_SIZE_SB64X64); - - /*if (srate < INT_MAX && sdist < INT_MAX) - encode_sb(cpi, tp, mi_row, mi_col, 1, BLOCK_SIZE_SB64X64); - - if (bsize == BLOCK_SIZE_SB64X64) { - assert(tp_orig < *tp); - assert(srate < INT_MAX); - assert(sdist < INT_MAX); - } else { - assert(tp_orig == *tp); - } - */ } static void encode_sb_row(VP9_COMP *cpi, int mi_row, TOKENEXTRA **tp, @@ -1899,8 +1882,7 @@ static void encode_sb_row(VP9_COMP *cpi, int mi_row, TOKENEXTRA **tp, cpi->unused_mode_skip_mask = 0xFFFFFFFFFFFFFE00; if (cpi->sf.reference_masking) { - rd_pick_reference_frame(cpi, tp, mi_row, mi_col, - &dummy_rate, &dummy_dist); + rd_pick_reference_frame(cpi, mi_row, mi_col); } if (cpi->sf.partition_by_variance || cpi->sf.use_lastframe_partitioning || |