diff options
| author | Yaowu Xu <yaowu@google.com> | 2012-05-02 13:53:15 -0700 |
|---|---|---|
| committer | Yaowu Xu <yaowu@google.com> | 2012-05-08 14:13:22 -0700 |
| commit | 54cf1d9ad3fe7ee3d0ce843b2a640f3fcf361887 (patch) | |
| tree | 92b7abad163172b6a6463ccef641e328bef01f54 /vp8/encoder/block.h | |
| parent | 813c6c3925186d3cc0b5fc8221d88ef2ceab878f (diff) | |
| download | libvpx-54cf1d9ad3fe7ee3d0ce843b2a640f3fcf361887.tar libvpx-54cf1d9ad3fe7ee3d0ce843b2a640f3fcf361887.tar.gz libvpx-54cf1d9ad3fe7ee3d0ce843b2a640f3fcf361887.tar.bz2 libvpx-54cf1d9ad3fe7ee3d0ce843b2a640f3fcf361887.zip | |
a number of fixes to entropy stats collection
1. block types
There are only three types of blocks for 8x8 transformed MBs, i.e. Y
block with DC does not exist for 8x8 transformed MBs as all MB using
8x8 transform have 2nd order haar transform. This commit introduced
a new macro BLOCK_TYPES_8X8 to reflect such fact.
2. context counters
This commit also fixed the mixed of context_counters between 4x4 and
8x8 transformed MBs. The mixed use of the counters leads me to think
the existing the context probabilities were not properly generated
from 8x8 transformed MBs.
3. redundant collecting in recoding
The commit also corrected the code that accumulates entropy stats by
making sure stats only collected for final packing, not during the
recode loop
Change-Id: I029f09f8f60bd0c3240cc392ff5c6d05435e322c
Diffstat (limited to 'vp8/encoder/block.h')
| -rw-r--r-- | vp8/encoder/block.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/vp8/encoder/block.h b/vp8/encoder/block.h index cca32f31f..2b21fa2b2 100644 --- a/vp8/encoder/block.h +++ b/vp8/encoder/block.h @@ -149,7 +149,7 @@ typedef struct unsigned int token_costs[BLOCK_TYPES] [COEF_BANDS] [PREV_COEF_CONTEXTS][MAX_ENTROPY_TOKENS]; - unsigned int token_costs_8x8[BLOCK_TYPES] [COEF_BANDS] + unsigned int token_costs_8x8[BLOCK_TYPES_8X8] [COEF_BANDS] [PREV_COEF_CONTEXTS] [MAX_ENTROPY_TOKENS]; int optimize; |