summaryrefslogtreecommitdiff
path: root/vp9/common
diff options
context:
space:
mode:
authorScott LaVarnway <slavarnway@google.com>2015-07-09 17:16:21 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2015-07-09 17:16:22 +0000
commite8103f36765c3e01fdca7ef2a37ceea6ed8ffe5d (patch)
tree03953074c8d252ba3584ec7614e027521a720ca6 /vp9/common
parent74f869b96215af8d61393f8f61f711207aa130a1 (diff)
parent13a4f14710baf3d6f649978f61ba3c40812704aa (diff)
downloadlibvpx-e8103f36765c3e01fdca7ef2a37ceea6ed8ffe5d.tar
libvpx-e8103f36765c3e01fdca7ef2a37ceea6ed8ffe5d.tar.gz
libvpx-e8103f36765c3e01fdca7ef2a37ceea6ed8ffe5d.tar.bz2
libvpx-e8103f36765c3e01fdca7ef2a37ceea6ed8ffe5d.zip
Merge "Eliminate num_8x8 and num_4x4 width/height lookups"
Diffstat (limited to 'vp9/common')
-rw-r--r--vp9/common/vp9_blockd.h7
1 files changed, 7 insertions, 0 deletions
diff --git a/vp9/common/vp9_blockd.h b/vp9/common/vp9_blockd.h
index fbdbb4426..8054cdfff 100644
--- a/vp9/common/vp9_blockd.h
+++ b/vp9/common/vp9_blockd.h
@@ -128,6 +128,11 @@ struct macroblockd_plane {
ENTROPY_CONTEXT *left_context;
int16_t seg_dequant[MAX_SEGMENTS][2];
+ // number of 4x4s in current block
+ uint16_t n4_w, n4_h;
+ // log2 of n4_w, n4_h
+ uint8_t n4_wl, n4_hl;
+
// encoder
const int16_t *dequant;
};
@@ -144,6 +149,8 @@ typedef struct RefBuffer {
typedef struct macroblockd {
struct macroblockd_plane plane[MAX_MB_PLANE];
+ uint8_t bmode_blocks_wl;
+ uint8_t bmode_blocks_hl;
FRAME_COUNTS *counts;
TileInfo tile;