790fb13215
Pearson correlation for above or left is significantly higher than for previous-in-scan-order (absolute values depend on position in scan, but in general, we gain about 0.1-0.2 by using either above or left; using both basically just makes this even better). For eob branch skipping, we continue to use the previous token in scan order. This helps about 0.9% on derf after re-training on a limited data set. Full re-training and results on larger-resolution clips are pending. Note that this commit breaks trellis, so we can probably get further gains out of it by fixing trellis at some later point. Change-Id: Iead68e296fc3a105cca746b5e3da9555d6010cfe
89 lines
3.2 KiB
C
89 lines
3.2 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 + 1];
|
|
|
|
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_sby_is_skippable_16x16(MACROBLOCKD *xd);
|
|
int vp9_sby_is_skippable_8x8(MACROBLOCKD *xd);
|
|
int vp9_sby_is_skippable_4x4(MACROBLOCKD *xd);
|
|
int vp9_sbuv_is_skippable_16x16(MACROBLOCKD *xd);
|
|
int vp9_sbuv_is_skippable_8x8(MACROBLOCKD *xd);
|
|
int vp9_sbuv_is_skippable_4x4(MACROBLOCKD *xd);
|
|
int vp9_sb64y_is_skippable_32x32(MACROBLOCKD *xd);
|
|
int vp9_sb64y_is_skippable_16x16(MACROBLOCKD *xd);
|
|
int vp9_sb64y_is_skippable_8x8(MACROBLOCKD *xd);
|
|
int vp9_sb64y_is_skippable_4x4(MACROBLOCKD *xd);
|
|
int vp9_sb64uv_is_skippable_32x32(MACROBLOCKD *xd);
|
|
int vp9_sb64uv_is_skippable_16x16(MACROBLOCKD *xd);
|
|
int vp9_sb64uv_is_skippable_8x8(MACROBLOCKD *xd);
|
|
int vp9_sb64uv_is_skippable_4x4(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_
|