111ca42133
Split macroblock and superblock tokenization and detokenization functions and coefficient-related data structs so that the bitstream layout and related code of superblock coefficients looks less like it's a hack to fit macroblocks in superblocks. In addition, unify chroma transform size selection from luma transform size (i.e. always use the same size, as long as it fits the predictor); in practice, this means 32x32 and 64x64 superblocks using the 16x16 luma transform will now use the 16x16 (instead of the 8x8) chroma transform, and 64x64 superblocks using the 32x32 luma transform will now use the 32x32 (instead of the 16x16) chroma transform. Lastly, add a trellis optimize function for 32x32 transform blocks. HD gains about 0.3%, STDHD about 0.15% and derf about 0.1%. There's a few negative points here and there that I might want to analyze a little closer. Change-Id: Ibad7c3ddfe1acfc52771dfc27c03e9783e054430
77 lines
2.6 KiB
C
77 lines
2.6 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 {
|
|
int16_t Token;
|
|
int16_t Extra;
|
|
} TOKENVALUE;
|
|
|
|
typedef struct {
|
|
const vp9_prob *context_tree;
|
|
int16_t Extra;
|
|
uint8_t Token;
|
|
uint8_t skip_eob_node;
|
|
} TOKENEXTRA;
|
|
|
|
typedef int64_t vp9_coeff_accum[REF_TYPES][COEF_BANDS][PREV_COEF_CONTEXTS]
|
|
[MAX_ENTROPY_TOKENS];
|
|
|
|
int vp9_mby_is_skippable_4x4(MACROBLOCKD *xd);
|
|
int vp9_mbuv_is_skippable_4x4(MACROBLOCKD *xd);
|
|
int vp9_mby_is_skippable_8x8(MACROBLOCKD *xd);
|
|
int vp9_mbuv_is_skippable_8x8(MACROBLOCKD *xd);
|
|
int vp9_mby_is_skippable_16x16(MACROBLOCKD *xd);
|
|
int vp9_sby_is_skippable_32x32(MACROBLOCKD *xd);
|
|
int vp9_sbuv_is_skippable_16x16(MACROBLOCKD *xd);
|
|
int vp9_sb64uv_is_skippable_32x32(MACROBLOCKD *xd);
|
|
|
|
struct VP9_COMP;
|
|
|
|
void vp9_tokenize_mb(struct VP9_COMP *cpi, MACROBLOCKD *xd,
|
|
TOKENEXTRA **t, int dry_run);
|
|
void vp9_tokenize_sb(struct VP9_COMP *cpi, MACROBLOCKD *xd,
|
|
TOKENEXTRA **t, int dry_run);
|
|
void vp9_tokenize_sb64(struct VP9_COMP *cpi, MACROBLOCKD *xd,
|
|
TOKENEXTRA **t, int dry_run);
|
|
|
|
void vp9_stuff_mb(struct VP9_COMP *cpi, MACROBLOCKD *xd,
|
|
TOKENEXTRA **t, int dry_run);
|
|
void vp9_stuff_sb(struct VP9_COMP *cpi, MACROBLOCKD *xd,
|
|
TOKENEXTRA **t, int dry_run);
|
|
void vp9_stuff_sb64(struct VP9_COMP *cpi, MACROBLOCKD *xd,
|
|
TOKENEXTRA **t, int dry_run);
|
|
|
|
#ifdef ENTROPY_STATS
|
|
void init_context_counters();
|
|
void print_context_counters();
|
|
|
|
extern vp9_coeff_accum context_counters_4x4[BLOCK_TYPES];
|
|
extern vp9_coeff_accum context_counters_8x8[BLOCK_TYPES];
|
|
extern vp9_coeff_accum context_counters_16x16[BLOCK_TYPES];
|
|
extern vp9_coeff_accum context_counters_32x32[BLOCK_TYPES];
|
|
#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 // VP9_ENCODER_VP9_TOKENIZE_H_
|