3e1cad9c69
This is the first patch for refactoring of the code related to high-precision mv, so that 1/4 and 1/8 pel motion vectors can co-exist in the same bit-stream by use of a frame level flag. The current patch works fine for only use of 1/4th and only use of 1/8th pel mv, but there are some issues with the mode switching in between. Subsequent patches on this change Id will fix the remaining issues. Patch 2: Adds fixes to make sure that multiple mv precisions can co-exist in the bit-stream. Frame level switching has been tested to work correctly. Patch 3: Fixes lines exceeding 80 char Patch 4: http://www.corp.google.com/~debargha/vp8_results/enhinterp.html Results on derf after ssse3 bugfix, compared to everything enabled but the 8-tap, 1/8-subpel and 1/16-subpel uv. Overall the gains are about 3% now. Hopefully there are no more bugs lingering. Apparently the sse3 bug affected the quartel subpel results more than the eighth pel ones (which is understandabale because one bad predictor due to the bug, matters less if there are a lot more subpel options available as in the 1/8 subpel case). The results in the 4th column correspond to the current settings. The first two columns correspond to two settings of adaptive switching of the 1/4 or 1/8 subpel mode based on initial Q estimate. These do not work as good as just using 1/8 all the time yet. Change-Id: I3ef392ad338329f4d68a85257a49f2b14f3af472
75 lines
2.6 KiB
C
75 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 __INC_ENTROPYMODE_H
|
|
#define __INC_ENTROPYMODE_H
|
|
|
|
#include "onyxc_int.h"
|
|
#include "treecoder.h"
|
|
|
|
typedef const int vp8_mbsplit[16];
|
|
|
|
#define VP8_NUMMBSPLITS 4
|
|
|
|
extern vp8_mbsplit vp8_mbsplits [VP8_NUMMBSPLITS];
|
|
|
|
extern const int vp8_mbsplit_count [VP8_NUMMBSPLITS]; /* # of subsets */
|
|
|
|
extern const vp8_prob vp8_mbsplit_probs [VP8_NUMMBSPLITS-1];
|
|
|
|
extern int vp8_mv_cont(const int_mv *l, const int_mv *a);
|
|
#define SUBMVREF_COUNT 5
|
|
extern const vp8_prob vp8_sub_mv_ref_prob2 [SUBMVREF_COUNT][VP8_SUBMVREFS-1];
|
|
|
|
|
|
extern const unsigned int vp8_kf_default_bmode_counts [VP8_BINTRAMODES] [VP8_BINTRAMODES] [VP8_BINTRAMODES];
|
|
|
|
|
|
extern const vp8_tree_index vp8_bmode_tree[];
|
|
|
|
extern const vp8_tree_index vp8_ymode_tree[];
|
|
extern const vp8_tree_index vp8_kf_ymode_tree[];
|
|
extern const vp8_tree_index vp8_uv_mode_tree[];
|
|
extern const vp8_tree_index vp8_i8x8_mode_tree[];
|
|
extern const vp8_tree_index vp8_mbsplit_tree[];
|
|
extern const vp8_tree_index vp8_mv_ref_tree[];
|
|
extern const vp8_tree_index vp8_sub_mv_ref_tree[];
|
|
|
|
extern struct vp8_token_struct vp8_bmode_encodings [VP8_BINTRAMODES];
|
|
extern struct vp8_token_struct vp8_ymode_encodings [VP8_YMODES];
|
|
extern struct vp8_token_struct vp8_kf_ymode_encodings [VP8_YMODES];
|
|
extern struct vp8_token_struct vp8_i8x8_mode_encodings [VP8_UV_MODES];
|
|
extern struct vp8_token_struct vp8_uv_mode_encodings [VP8_UV_MODES];
|
|
extern struct vp8_token_struct vp8_mbsplit_encodings [VP8_NUMMBSPLITS];
|
|
|
|
/* Inter mode values do not start at zero */
|
|
|
|
extern struct vp8_token_struct vp8_mv_ref_encoding_array [VP8_MVREFS];
|
|
extern struct vp8_token_struct vp8_sub_mv_ref_encoding_array [VP8_SUBMVREFS];
|
|
|
|
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_mode_init(void);
|
|
|
|
void vp8_init_mbmode_probs(VP8_COMMON *x);
|
|
|
|
extern void vp8_update_mode_context(VP8_COMMON *pc);;
|
|
|
|
void vp8_default_bmode_probs(vp8_prob dest [VP8_BINTRAMODES-1]);
|
|
void vp8_kf_default_bmode_probs(vp8_prob dest [VP8_BINTRAMODES] [VP8_BINTRAMODES] [VP8_BINTRAMODES-1]);
|
|
|
|
#endif
|