Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Xiph.Org
aom-rav1e
Commits
228b8232
Commit
228b8232
authored
Jun 28, 2013
by
Dmitry Kovalev
Browse files
Cosmetic reordering of FRAME_CONTEXT members.
Change-Id: Id641e5188adf55e53e606e5813ae45feaf7abbd2
parent
59070f6e
Changes
1
Hide whitespace changes
Inline
Side-by-side
vp9/common/vp9_onyxc_int.h
View file @
228b8232
...
...
@@ -43,40 +43,38 @@
#define MAX_LAG_BUFFERS 25
typedef
struct
frame_contexts
{
// y_mode, uv_mode, partition
vp9_prob
y_mode_prob
[
BLOCK_SIZE_GROUPS
][
VP9_INTRA_MODES
-
1
];
vp9_prob
uv_mode_prob
[
VP9_INTRA_MODES
][
VP9_INTRA_MODES
-
1
];
vp9_prob
partition_prob
[
NUM_FRAME_TYPES
][
NUM_PARTITION_CONTEXTS
]
[
PARTITION_TYPES
-
1
];
nmv_context
nmvc
;
nmv_context
pre_nmvc
;
/* interframe intra mode probs */
vp9_prob
pre_y_mode_prob
[
BLOCK_SIZE_GROUPS
][
VP9_INTRA_MODES
-
1
];
vp9_prob
pre_uv_mode_prob
[
VP9_INTRA_MODES
][
VP9_INTRA_MODES
-
1
];
vp9_prob
pre_partition_prob
[
NUM_PARTITION_CONTEXTS
][
PARTITION_TYPES
-
1
];
/* interframe intra mode probs */
unsigned
int
y_mode_counts
[
BLOCK_SIZE_GROUPS
][
VP9_INTRA_MODES
];
unsigned
int
uv_mode_counts
[
VP9_INTRA_MODES
][
VP9_INTRA_MODES
];
unsigned
int
partition_counts
[
NUM_PARTITION_CONTEXTS
][
PARTITION_TYPES
];
// coeff
vp9_coeff_probs_model
coef_probs
[
TX_SIZE_MAX_SB
][
BLOCK_TYPES
];
vp9_coeff_probs_model
pre_coef_probs
[
TX_SIZE_MAX_SB
][
BLOCK_TYPES
];
vp9_coeff_count_model
coef_counts
[
TX_SIZE_MAX_SB
][
BLOCK_TYPES
];
unsigned
int
eob_branch_counts
[
TX_SIZE_MAX_SB
][
BLOCK_TYPES
][
REF_TYPES
]
[
COEF_BANDS
][
PREV_COEF_CONTEXTS
];
nmv_context_counts
NMVcount
;
// switchable_interp
vp9_prob
switchable_interp_prob
[
VP9_SWITCHABLE_FILTERS
+
1
]
[
VP9_SWITCHABLE_FILTERS
-
1
];
vp9_prob
pre_switchable_interp_prob
[
VP9_SWITCHABLE_FILTERS
+
1
]
[
VP9_SWITCHABLE_FILTERS
-
1
];
[
VP9_SWITCHABLE_FILTERS
-
1
];
unsigned
int
switchable_interp_count
[
VP9_SWITCHABLE_FILTERS
+
1
]
[
VP9_SWITCHABLE_FILTERS
];
// inter_mode
vp9_prob
inter_mode_probs
[
INTER_MODE_CONTEXTS
][
VP9_INTER_MODES
-
1
];
vp9_prob
pre_inter_mode_probs
[
INTER_MODE_CONTEXTS
][
VP9_INTER_MODES
-
1
];
unsigned
int
inter_mode_counts
[
INTER_MODE_CONTEXTS
][
VP9_INTER_MODES
-
1
][
2
];
// intra_inter, comp_inter, single_ref, comp_ref
vp9_prob
intra_inter_prob
[
INTRA_INTER_CONTEXTS
];
vp9_prob
comp_inter_prob
[
COMP_INTER_CONTEXTS
];
vp9_prob
single_ref_prob
[
REF_CONTEXTS
][
2
];
...
...
@@ -90,6 +88,7 @@ typedef struct frame_contexts {
unsigned
int
single_ref_count
[
REF_CONTEXTS
][
2
][
2
];
unsigned
int
comp_ref_count
[
REF_CONTEXTS
][
2
];
// tx_probs
vp9_prob
tx_probs_32x32p
[
TX_SIZE_CONTEXTS
][
TX_SIZE_MAX_SB
-
1
];
vp9_prob
tx_probs_16x16p
[
TX_SIZE_CONTEXTS
][
TX_SIZE_MAX_SB
-
2
];
vp9_prob
tx_probs_8x8p
[
TX_SIZE_CONTEXTS
][
TX_SIZE_MAX_SB
-
3
];
...
...
@@ -100,9 +99,15 @@ typedef struct frame_contexts {
unsigned
int
tx_count_16x16p
[
TX_SIZE_CONTEXTS
][
TX_SIZE_MAX_SB
-
1
];
unsigned
int
tx_count_8x8p
[
TX_SIZE_CONTEXTS
][
TX_SIZE_MAX_SB
-
2
];
// mbskip
vp9_prob
mbskip_probs
[
MBSKIP_CONTEXTS
];
vp9_prob
pre_mbskip_probs
[
MBSKIP_CONTEXTS
];
unsigned
int
mbskip_count
[
MBSKIP_CONTEXTS
][
2
];
// mv
nmv_context
nmvc
;
nmv_context
pre_nmvc
;
nmv_context_counts
NMVcount
;
}
FRAME_CONTEXT
;
typedef
enum
{
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment