0c917fc975
A patch on compound inter-intra prediction. In compound inter-intra prediction, a new predictor for 16x16 inter coded MBs are obtained by combining a single inter predictor with a 16x16 intra predictor, in a manner that the weight varies with distance from the top/left boundary. The current search strategy is to combine the best inter mode with the best intra mode obtained independently. Results so far: derf +0.31% yt +0.32% std-hd +0.35% hd +0.42% It is conceivable that the results would improve somewhat with a more thorough search strategy where all intra modes are searched given the best mv, or even a joint search for the best mv and the best intra mode. Change-Id: I7951f1ed0d6eb31ca32ac24d120f1585bcd8d79b
116 lines
4.1 KiB
C
116 lines
4.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_ENTROPYMODE_H
|
|
#define __INC_ENTROPYMODE_H
|
|
|
|
#include "blockd.h"
|
|
#include "treecoder.h"
|
|
|
|
#define SUBMVREF_COUNT 5
|
|
#define VP9_NUMMBSPLITS 4
|
|
#if CONFIG_COMP_INTRA_PRED
|
|
#define DEFAULT_COMP_INTRA_PROB 32
|
|
#endif
|
|
|
|
#if CONFIG_COMP_INTERINTRA_PRED
|
|
#define VP9_DEF_INTERINTRA_PROB 248
|
|
#define VP9_UPD_INTERINTRA_PROB 192
|
|
// whether to use a separate uv mode (1) or use the same as the y mode (0)
|
|
#define SEPARATE_INTERINTRA_UV 0
|
|
#endif
|
|
|
|
typedef const int vp9_mbsplit[16];
|
|
|
|
extern vp9_mbsplit vp9_mbsplits[VP9_NUMMBSPLITS];
|
|
|
|
extern const int vp9_mbsplit_count[VP9_NUMMBSPLITS]; /* # of subsets */
|
|
|
|
extern const vp9_prob vp9_mbsplit_probs[VP9_NUMMBSPLITS - 1];
|
|
|
|
extern int vp9_mv_cont(const int_mv *l, const int_mv *a);
|
|
|
|
extern const vp9_prob vp9_sub_mv_ref_prob[VP9_SUBMVREFS - 1];
|
|
|
|
extern const vp9_prob vp9_sub_mv_ref_prob2[SUBMVREF_COUNT][VP9_SUBMVREFS - 1];
|
|
|
|
extern const unsigned int vp9_kf_default_bmode_counts[VP9_KF_BINTRAMODES]
|
|
[VP9_KF_BINTRAMODES]
|
|
[VP9_KF_BINTRAMODES];
|
|
|
|
extern const vp9_tree_index vp9_bmode_tree[];
|
|
extern const vp9_tree_index vp9_kf_bmode_tree[];
|
|
|
|
extern const vp9_tree_index vp9_ymode_tree[];
|
|
extern const vp9_tree_index vp9_kf_ymode_tree[];
|
|
extern const vp9_tree_index vp9_uv_mode_tree[];
|
|
#define vp9_sb_ymode_tree vp9_uv_mode_tree
|
|
extern const vp9_tree_index vp9_i8x8_mode_tree[];
|
|
extern const vp9_tree_index vp9_mbsplit_tree[];
|
|
extern const vp9_tree_index vp9_mv_ref_tree[];
|
|
extern const vp9_tree_index vp9_sb_mv_ref_tree[];
|
|
extern const vp9_tree_index vp9_sub_mv_ref_tree[];
|
|
|
|
extern struct vp9_token_struct vp9_bmode_encodings[VP9_NKF_BINTRAMODES];
|
|
extern struct vp9_token_struct vp9_kf_bmode_encodings[VP9_KF_BINTRAMODES];
|
|
extern struct vp9_token_struct vp9_ymode_encodings[VP9_YMODES];
|
|
extern struct vp9_token_struct vp9_sb_kf_ymode_encodings[VP9_I32X32_MODES];
|
|
extern struct vp9_token_struct vp9_kf_ymode_encodings[VP9_YMODES];
|
|
extern struct vp9_token_struct vp9_i8x8_mode_encodings[VP9_I8X8_MODES];
|
|
extern struct vp9_token_struct vp9_uv_mode_encodings[VP9_UV_MODES];
|
|
extern struct vp9_token_struct vp9_mbsplit_encodings[VP9_NUMMBSPLITS];
|
|
|
|
/* Inter mode values do not start at zero */
|
|
|
|
extern struct vp9_token_struct vp9_mv_ref_encoding_array[VP9_MVREFS];
|
|
extern struct vp9_token_struct vp9_sb_mv_ref_encoding_array[VP9_MVREFS];
|
|
extern struct vp9_token_struct vp9_sub_mv_ref_encoding_array[VP9_SUBMVREFS];
|
|
|
|
void vp9_entropy_mode_init(void);
|
|
|
|
struct VP9Common;
|
|
|
|
void vp9_init_mbmode_probs(struct VP9Common *x);
|
|
|
|
extern void vp9_init_mode_contexts(struct VP9Common *pc);
|
|
|
|
extern void vp9_update_mode_context(struct VP9Common *pc);
|
|
|
|
extern void vp9_accum_mv_refs(struct VP9Common *pc,
|
|
MB_PREDICTION_MODE m,
|
|
const int context);
|
|
|
|
void vp9_default_bmode_probs(vp9_prob dest[VP9_NKF_BINTRAMODES - 1]);
|
|
|
|
void vp9_kf_default_bmode_probs(vp9_prob dest[VP9_KF_BINTRAMODES]
|
|
[VP9_KF_BINTRAMODES]
|
|
[VP9_KF_BINTRAMODES - 1]);
|
|
|
|
void vp9_adapt_mode_probs(struct VP9Common *);
|
|
|
|
#define VP9_SWITCHABLE_FILTERS 2 /* number of switchable filters */
|
|
|
|
extern const INTERPOLATIONFILTERTYPE vp9_switchable_interp
|
|
[VP9_SWITCHABLE_FILTERS];
|
|
|
|
extern const int vp9_switchable_interp_map[SWITCHABLE + 1];
|
|
|
|
extern const vp9_tree_index vp9_switchable_interp_tree
|
|
[2 * (VP9_SWITCHABLE_FILTERS - 1)];
|
|
|
|
extern struct vp9_token_struct vp9_switchable_interp_encodings
|
|
[VP9_SWITCHABLE_FILTERS];
|
|
|
|
extern const vp9_prob vp9_switchable_interp_prob[VP9_SWITCHABLE_FILTERS + 1]
|
|
[VP9_SWITCHABLE_FILTERS - 1];
|
|
|
|
#endif
|