shithub: libvpx

Info  •  Files  •  Log  •  Branches

Optimize the decode_partition. About 0.7% gain on N10.

Change-Id: Ia689c254bd2d4f274abcc451a9b758f62e3a2b1f

--- a/vp9/decoder/vp9_decodeframe.c

+++ b/vp9/decoder/vp9_decodeframe.c

@@ -381,6 +381,15 @@

   VP9_COMMON *const cm = &pbi->common;

   const int less8x8 = bsize < BLOCK_8X8;

   MB_MODE_INFO *mbmi = set_offsets(cm, xd, tile, bsize, mi_row, mi_col);

+

+  if (bsize >= BLOCK_8X8 && (cm->subsampling_x || cm->subsampling_y)) {

+    const BLOCK_SIZE uv_subsize =

+        ss_size_lookup[bsize][cm->subsampling_x][cm->subsampling_y];

+    if (uv_subsize == BLOCK_INVALID)

+      vpx_internal_error(xd->error_info,

+                         VPX_CODEC_CORRUPT_FRAME, "Invalid block size.");

+  }

+

   vp9_read_mode_info(pbi, xd, tile, mi_row, mi_col, r);

   if (less8x8)

@@ -444,7 +453,7 @@

   VP9_COMMON *const cm = &pbi->common;

   const int hbs = num_8x8_blocks_wide_lookup[bsize] / 2;

   PARTITION_TYPE partition;

-  BLOCK_SIZE subsize, uv_subsize;

+  BLOCK_SIZE subsize;

   if (mi_row >= cm->mi_rows || mi_col >= cm->mi_cols)

     return;

@@ -451,11 +460,7 @@

   partition = read_partition(cm, xd, hbs, mi_row, mi_col, bsize, r);

   subsize = get_subsize(bsize, partition);

-  uv_subsize = ss_size_lookup[subsize][cm->subsampling_x][cm->subsampling_y];

-  if (subsize >= BLOCK_8X8 && uv_subsize == BLOCK_INVALID)

-    vpx_internal_error(xd->error_info,

-                       VPX_CODEC_CORRUPT_FRAME, "Invalid block size.");

-  if (subsize < BLOCK_8X8) {

+  if (bsize == BLOCK_8X8) {

     decode_block(pbi, xd, tile, mi_row, mi_col, r, subsize);

   } else {

     switch (partition) {