diff options
| author | Paul Wilkins <paulwilkins@google.com> | 2013-11-08 04:24:51 -0800 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2013-11-08 04:24:51 -0800 |
| commit | 0ed606fd40c420f7db8fd25cc9057b197200c4fd (patch) | |
| tree | 4af342e7ad7ce6c9e584aed8fc331c2d5f81d68a /vp9/encoder | |
| parent | a6462990e6cd42bfe1a02dd6c452dddde0902f28 (diff) | |
| parent | 84b3b03705b1fc02b485152b53c5145c409da093 (diff) | |
| download | libvpx-0ed606fd40c420f7db8fd25cc9057b197200c4fd.tar libvpx-0ed606fd40c420f7db8fd25cc9057b197200c4fd.tar.gz libvpx-0ed606fd40c420f7db8fd25cc9057b197200c4fd.tar.bz2 libvpx-0ed606fd40c420f7db8fd25cc9057b197200c4fd.zip | |
Merge "Removed unused rate parameter."
Diffstat (limited to 'vp9/encoder')
| -rw-r--r-- | vp9/encoder/vp9_encodeframe.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/vp9/encoder/vp9_encodeframe.c b/vp9/encoder/vp9_encodeframe.c index a45299b59..702fc70bb 100644 --- a/vp9/encoder/vp9_encodeframe.c +++ b/vp9/encoder/vp9_encodeframe.c @@ -1765,7 +1765,7 @@ static void rd_pick_reference_frame(VP9_COMP *cpi, const TileInfo *const tile, } static void encode_sb_row(VP9_COMP *cpi, const TileInfo *const tile, - int mi_row, TOKENEXTRA **tp, int *totalrate) { + int mi_row, TOKENEXTRA **tp) { VP9_COMMON * const cm = &cpi->common; int mi_col; @@ -1910,7 +1910,6 @@ static void encode_frame_internal(VP9_COMP *cpi) { MACROBLOCK * const x = &cpi->mb; VP9_COMMON * const cm = &cpi->common; MACROBLOCKD * const xd = &x->e_mbd; - int totalrate; // fprintf(stderr, "encode_frame_internal frame %d (%d) type %d\n", // cpi->common.current_video_frame, cpi->common.show_frame, @@ -1926,8 +1925,6 @@ static void encode_frame_internal(VP9_COMP *cpi) { } #endif - totalrate = 0; - vp9_zero(cm->counts.switchable_interp); vp9_zero(cpi->tx_stepdown_count); @@ -1989,7 +1986,7 @@ static void encode_frame_internal(VP9_COMP *cpi) { vp9_tile_init(&tile, cm, tile_row, tile_col); for (mi_row = tile.mi_row_start; mi_row < tile.mi_row_end; mi_row += 8) - encode_sb_row(cpi, &tile, mi_row, &tp, &totalrate); + encode_sb_row(cpi, &tile, mi_row, &tp); cpi->tok_count[tile_row][tile_col] = (unsigned int)(tp - tp_old); assert(tp - cpi->tok <= get_token_alloc(cm->mb_rows, cm->mb_cols)); @@ -2015,10 +2012,6 @@ static void encode_frame_internal(VP9_COMP *cpi) { cpi->sf.skip_encode_frame = 0; } - // 256 rate units to the bit, - // projected_frame_size in units of BYTES - cpi->projected_frame_size = totalrate >> 8; - #if 0 // Keep record of the total distortion this time around for future use cpi->last_frame_distortion = cpi->frame_distortion; |