diff options
| author | Yaowu Xu <yaowu@google.com> | 2015-04-01 15:06:55 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2015-04-01 15:06:55 -0700 |
| commit | fff4654d3643b02d75f06df79164c259add89f08 (patch) | |
| tree | 8e7983a3357e460561c98b656006659a005e4575 /vp9/encoder/vp9_encodeframe.c | |
| parent | cf4447339e1a3c615b97ebfe04ba80e54f568853 (diff) | |
| parent | ba91b54d7c3800caa7453316b4eaf1324d265314 (diff) | |
| download | libvpx-fff4654d3643b02d75f06df79164c259add89f08.tar libvpx-fff4654d3643b02d75f06df79164c259add89f08.tar.gz libvpx-fff4654d3643b02d75f06df79164c259add89f08.tar.bz2 libvpx-fff4654d3643b02d75f06df79164c259add89f08.zip | |
Merge "Simplify bsize calculation"
Diffstat (limited to 'vp9/encoder/vp9_encodeframe.c')
| -rw-r--r-- | vp9/encoder/vp9_encodeframe.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/vp9/encoder/vp9_encodeframe.c b/vp9/encoder/vp9_encodeframe.c index dfc88d8ed..35c609d4f 100644 --- a/vp9/encoder/vp9_encodeframe.c +++ b/vp9/encoder/vp9_encodeframe.c @@ -559,18 +559,10 @@ static void choose_partitioning(VP9_COMP *cpi, const YV12_BUFFER_CONFIG *yv12_g = get_ref_frame_buffer(cpi, GOLDEN_FRAME); unsigned int y_sad, y_sad_g; - BLOCK_SIZE bsize; - if (mi_row + 4 < cm->mi_rows && mi_col + 4 < cm->mi_cols) - bsize = BLOCK_64X64; - else if (mi_row + 4 < cm->mi_rows && mi_col + 4 >= cm->mi_cols) - bsize = BLOCK_32X64; - else if (mi_row + 4 >= cm->mi_rows && mi_col + 4 < cm->mi_cols) - bsize = BLOCK_64X32; - else - bsize = BLOCK_32X32; + const BLOCK_SIZE bsize = BLOCK_32X32 + + (mi_col + 4 < cm->mi_cols) * 2 + (mi_row + 4 < cm->mi_rows); assert(yv12 != NULL); - if (yv12_g && yv12_g != yv12) { vp9_setup_pre_planes(xd, 0, yv12_g, mi_row, mi_col, &cm->frame_refs[GOLDEN_FRAME - 1].sf); |