1fe85a35e0
This patch incorporates adaptive entropy coding of coefficient tokens, and mode/mv information based on distributions encountered in a frame. Specifically, there is an initial forward update to the probabilities in the bitstream as before for coding the symbols in the frame, however at the end of decoding each frame, the forward update to the probabilities is reverted and instead the probabilities are updated towards the actual distributions encountered within the frame. The amount of update is weighted by the number of hits within each context. Results on derf/hd/std-hd are all up by 1.6%. On derf, the most of the gains come from coefficients, however for the hd and std-hd sets, the most of the gains come from the mode/mv information updates. Change-Id: I708c0e11fdacafee04940fe7ae159ba6844005fd
87 lines
3.1 KiB
C
87 lines
3.1 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 __INC_ENTROPYMV_H
|
|
#define __INC_ENTROPYMV_H
|
|
|
|
#include "treecoder.h"
|
|
#include "vpx_config.h"
|
|
|
|
enum
|
|
{
|
|
mv_max = 1023, /* max absolute value of a MV component */
|
|
MVvals = (2 * mv_max) + 1, /* # possible values "" */
|
|
mvlong_width = 10, /* Large MVs have 9 bit magnitudes */
|
|
mvnum_short = 8, /* magnitudes 0 through 7 */
|
|
mvnum_short_bits = 3, /* number of bits for short mvs */
|
|
|
|
mvfp_max = 255, /* max absolute value of a full pixel MV component */
|
|
MVfpvals = (2 * mvfp_max) + 1, /* # possible full pixel MV values */
|
|
|
|
/* probability offsets for coding each MV component */
|
|
|
|
mvpis_short = 0, /* short (<= 7) vs long (>= 8) */
|
|
MVPsign, /* sign for non-zero */
|
|
MVPshort, /* 8 short values = 7-position tree */
|
|
|
|
MVPbits = MVPshort + mvnum_short - 1, /* mvlong_width long value bits */
|
|
MVPcount = MVPbits + mvlong_width /* (with independent probabilities) */
|
|
};
|
|
|
|
typedef struct mv_context
|
|
{
|
|
vp8_prob prob[MVPcount]; /* often come in row, col pairs */
|
|
} MV_CONTEXT;
|
|
|
|
extern const MV_CONTEXT vp8_mv_update_probs[2], vp8_default_mv_context[2];
|
|
|
|
#if CONFIG_HIGH_PRECISION_MV
|
|
enum
|
|
{
|
|
mv_max_hp = 2047, /* max absolute value of a MV component */
|
|
MVvals_hp = (2 * mv_max_hp) + 1, /* # possible values "" */
|
|
mvlong_width_hp = 11, /* Large MVs have 9 bit magnitudes */
|
|
mvnum_short_hp = 16, /* magnitudes 0 through 15 */
|
|
mvnum_short_bits_hp = 4, /* number of bits for short mvs */
|
|
|
|
mvfp_max_hp = 255, /* max absolute value of a full pixel MV component */
|
|
MVfpvals_hp = (2 * mvfp_max_hp) + 1, /* # possible full pixel MV values */
|
|
|
|
/* probability offsets for coding each MV component */
|
|
|
|
mvpis_short_hp = 0, /* short (<= 7) vs long (>= 8) */
|
|
MVPsign_hp, /* sign for non-zero */
|
|
MVPshort_hp, /* 8 short values = 7-position tree */
|
|
|
|
MVPbits_hp = MVPshort_hp + mvnum_short_hp - 1, /* mvlong_width long value bits */
|
|
MVPcount_hp = MVPbits_hp + mvlong_width_hp /* (with independent probabilities) */
|
|
};
|
|
|
|
typedef struct mv_context_hp
|
|
{
|
|
vp8_prob prob[MVPcount_hp]; /* often come in row, col pairs */
|
|
} MV_CONTEXT_HP;
|
|
|
|
extern const MV_CONTEXT_HP vp8_mv_update_probs_hp[2], vp8_default_mv_context_hp[2];
|
|
|
|
#endif /* CONFIG_HIGH_PRECISION_MV */
|
|
|
|
extern const vp8_tree_index vp8_small_mvtree[];
|
|
extern struct vp8_token_struct vp8_small_mvencodings [8];
|
|
#if CONFIG_HIGH_PRECISION_MV
|
|
extern const vp8_tree_index vp8_small_mvtree_hp[];
|
|
extern struct vp8_token_struct vp8_small_mvencodings_hp [16];
|
|
#endif
|
|
|
|
void vp8_entropy_mv_init();
|
|
|
|
#endif
|