diff options
| author | Jingning Han <jingning@google.com> | 2014-02-13 12:10:45 -0800 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2014-02-13 12:10:45 -0800 |
| commit | 95abad916995a418e900b05e878b93835f40fd71 (patch) | |
| tree | 991a24198e4b1b210aa7d43d3b050049baf63f27 | |
| parent | ea31368dabffc5c39699e1fcd746ee41c8640e4c (diff) | |
| parent | 4712877ef62114fd766172624ccfd5a19178301a (diff) | |
| download | libvpx-95abad916995a418e900b05e878b93835f40fd71.tar libvpx-95abad916995a418e900b05e878b93835f40fd71.tar.gz libvpx-95abad916995a418e900b05e878b93835f40fd71.tar.bz2 libvpx-95abad916995a418e900b05e878b93835f40fd71.zip | |
Merge "Remove redundant set_offsets in rtc coding mode"
| -rw-r--r-- | vp9/encoder/vp9_encodeframe.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/vp9/encoder/vp9_encodeframe.c b/vp9/encoder/vp9_encodeframe.c index 73c199278..2ae375fad 100644 --- a/vp9/encoder/vp9_encodeframe.c +++ b/vp9/encoder/vp9_encodeframe.c @@ -1042,6 +1042,7 @@ static int sb_has_motion(const VP9_COMMON *cm, MODE_INFO **prev_mi_8x8) { } return 0; } + static void update_state_rt(VP9_COMP *cpi, PICK_MODE_CONTEXT *ctx, BLOCK_SIZE bsize, int output_enabled) { int i; @@ -2358,9 +2359,8 @@ static void encode_rtc_sb_row(VP9_COMP *cpi, const TileInfo *const tile, const int idx_str = cm->mode_info_stride * mi_row + mi_col; MODE_INFO **mi_8x8 = cm->mi_grid_visible + idx_str; - cpi->mb.source_variance = UINT_MAX; - set_offsets(cpi, tile, mi_row, mi_col, BLOCK_64X64); + set_partitioning(cpi, tile, mi_8x8, mi_row, mi_col); rtc_use_partition(cpi, tile, mi_8x8, tp, mi_row, mi_col, BLOCK_64X64, &dummy_rate, &dummy_dist, 1); |