ab480cede5
This commit changed the ENTROPY_CONTEXT conversion between MBs that have different transform sizes. In additioin, this commit also did a number of cleanup/bug fix: 1. removed duplicate function vp9_fix_contexts() and changed to use vp8_reset_mb_token_contexts() for both encoder and decoder 2. fixed a bug in stuff_mb_16x16 where wrong context was used for the UV. 3. changed reset all context to 0 if a MB is skipped to simplify the logic. Change-Id: I7bc57a5fb6dbf1f85eac1543daaeb3a61633275c
84 lines
2.8 KiB
C
84 lines
2.8 KiB
C
/*
|
|
* Copyright (c) 2010 The WebM project authors. All Rights Reserved.
|
|
*
|
|
* Use of this source code is governed by a BSD-style license
|
|
* that can be found in the LICENSE file in the root of the source
|
|
* tree. An additional intellectual property rights grant can be found
|
|
* in the file PATENTS. All contributing project authors may
|
|
* be found in the AUTHORS file in the root of the source tree.
|
|
*/
|
|
|
|
|
|
#ifndef VP9_ENCODER_VP9_TOKENIZE_H_
|
|
#define VP9_ENCODER_VP9_TOKENIZE_H_
|
|
|
|
#include "vp9/common/vp9_entropy.h"
|
|
#include "vp9/encoder/vp9_block.h"
|
|
|
|
void vp9_tokenize_initialize();
|
|
|
|
typedef struct {
|
|
short Token;
|
|
short Extra;
|
|
} TOKENVALUE;
|
|
|
|
typedef struct {
|
|
const vp9_prob *context_tree;
|
|
short Extra;
|
|
unsigned char Token;
|
|
unsigned char skip_eob_node;
|
|
} TOKENEXTRA;
|
|
|
|
typedef INT64 vp9_coeff_accum[COEF_BANDS][PREV_COEF_CONTEXTS]
|
|
[MAX_ENTROPY_TOKENS];
|
|
|
|
extern int vp9_mby_is_skippable_4x4(MACROBLOCKD *xd, int has_y2_block);
|
|
extern int vp9_mbuv_is_skippable_4x4(MACROBLOCKD *xd);
|
|
extern int vp9_mby_is_skippable_8x8(MACROBLOCKD *xd, int has_y2_block);
|
|
extern int vp9_mbuv_is_skippable_8x8(MACROBLOCKD *xd);
|
|
extern int vp9_mby_is_skippable_16x16(MACROBLOCKD *xd);
|
|
#if CONFIG_SUPERBLOCKS && CONFIG_TX32X32
|
|
extern int vp9_sby_is_skippable_32x32(MACROBLOCKD *xd);
|
|
extern int vp9_sbuv_is_skippable_16x16(MACROBLOCKD *xd);
|
|
#endif
|
|
|
|
struct VP9_COMP;
|
|
|
|
extern void vp9_tokenize_mb(struct VP9_COMP *cpi, MACROBLOCKD *xd,
|
|
TOKENEXTRA **t, int dry_run);
|
|
extern void vp9_tokenize_sb(struct VP9_COMP *cpi, MACROBLOCKD *xd,
|
|
TOKENEXTRA **t, int dry_run);
|
|
|
|
extern void vp9_stuff_mb(struct VP9_COMP *cpi, MACROBLOCKD *xd,
|
|
TOKENEXTRA **t, int dry_run);
|
|
#if CONFIG_SUPERBLOCKS && CONFIG_TX32X32
|
|
extern void vp9_stuff_sb(struct VP9_COMP *cpi, MACROBLOCKD *xd,
|
|
TOKENEXTRA **t, int dry_run);
|
|
#endif
|
|
|
|
#if CONFIG_SUPERBLOCKS && CONFIG_TX32X32
|
|
extern void vp9_fix_contexts_sb(MACROBLOCKD *xd);
|
|
#endif
|
|
#ifdef ENTROPY_STATS
|
|
void init_context_counters();
|
|
void print_context_counters();
|
|
|
|
extern vp9_coeff_accum context_counters_4x4[BLOCK_TYPES_4X4];
|
|
extern vp9_coeff_accum context_counters_8x8[BLOCK_TYPES_8X8];
|
|
extern vp9_coeff_accum context_counters_16x16[BLOCK_TYPES_16X16];
|
|
extern vp9_coeff_accum context_counters_32x32[BLOCK_TYPES_32X32];
|
|
|
|
extern vp9_coeff_accum hybrid_context_counters_4x4[BLOCK_TYPES_4X4];
|
|
extern vp9_coeff_accum hybrid_context_counters_8x8[BLOCK_TYPES_8X8];
|
|
extern vp9_coeff_accum hybrid_context_counters_16x16[BLOCK_TYPES_16X16];
|
|
#endif
|
|
|
|
extern const int *vp9_dct_value_cost_ptr;
|
|
/* TODO: The Token field should be broken out into a separate char array to
|
|
* improve cache locality, since it's needed for costing when the rest of the
|
|
* fields are not.
|
|
*/
|
|
extern const TOKENVALUE *vp9_dct_value_tokens_ptr;
|
|
|
|
#endif /* tokenize_h */
|