Skip to content
GitLab
Menu
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
cb92f4f0
Commit
cb92f4f0
authored
Dec 06, 2013
by
Dmitry Kovalev
Browse files
Renaming vp9_get_pred_context_tx_size() function.
Change-Id: Ia6d6f4dfb1fd1ec0f8ba53796b59a802e9d7881d
parent
dcb17eae
Changes
4
Hide whitespace changes
Inline
Side-by-side
vp9/common/vp9_pred_common.c
View file @
cb92f4f0
...
...
@@ -364,7 +364,7 @@ unsigned char vp9_get_pred_context_single_ref_p2(const MACROBLOCKD *xd) {
// The mode info data structure has a one element border above and to the
// left of the entries corresponding to real blocks.
// The prediction flags in these dummy entries are initialized to 0.
unsigned
char
vp9_get_
pred
_context
_tx_size
(
const
MACROBLOCKD
*
xd
)
{
int
vp9_get_
tx_size
_context
(
const
MACROBLOCKD
*
xd
)
{
const
int
max_tx_size
=
max_txsize_lookup
[
xd
->
mi_8x8
[
0
]
->
mbmi
.
sb_type
];
const
MB_MODE_INFO
*
const
above_mbmi
=
get_above_mbmi
(
get_above_mi
(
xd
));
const
MB_MODE_INFO
*
const
left_mbmi
=
get_left_mbmi
(
get_left_mi
(
xd
));
...
...
vp9/common/vp9_pred_common.h
View file @
cb92f4f0
...
...
@@ -100,7 +100,7 @@ static INLINE vp9_prob vp9_get_pred_prob_single_ref_p2(const VP9_COMMON *cm,
return
cm
->
fc
.
single_ref_prob
[
pred_context
][
1
];
}
unsigned
char
vp9_get_
pred
_context
_tx_size
(
const
MACROBLOCKD
*
xd
);
int
vp9_get_
tx_size
_context
(
const
MACROBLOCKD
*
xd
);
static
const
vp9_prob
*
get_tx_probs
(
TX_SIZE
max_tx_size
,
int
ctx
,
const
struct
tx_probs
*
tx_probs
)
{
...
...
@@ -119,8 +119,7 @@ static const vp9_prob *get_tx_probs(TX_SIZE max_tx_size, int ctx,
static
const
vp9_prob
*
get_tx_probs2
(
TX_SIZE
max_tx_size
,
const
MACROBLOCKD
*
xd
,
const
struct
tx_probs
*
tx_probs
)
{
const
int
ctx
=
vp9_get_pred_context_tx_size
(
xd
);
return
get_tx_probs
(
max_tx_size
,
ctx
,
tx_probs
);
return
get_tx_probs
(
max_tx_size
,
vp9_get_tx_size_context
(
xd
),
tx_probs
);
}
static
unsigned
int
*
get_tx_counts
(
TX_SIZE
max_tx_size
,
int
ctx
,
...
...
vp9/decoder/vp9_decodemv.c
View file @
cb92f4f0
...
...
@@ -63,7 +63,7 @@ static int read_segment_id(vp9_reader *r, const struct segmentation *seg) {
static
TX_SIZE
read_selected_tx_size
(
VP9_COMMON
*
cm
,
MACROBLOCKD
*
xd
,
TX_SIZE
max_tx_size
,
vp9_reader
*
r
)
{
const
int
ctx
=
vp9_get_
pred
_context
_tx_size
(
xd
);
const
int
ctx
=
vp9_get_
tx_size
_context
(
xd
);
const
vp9_prob
*
tx_probs
=
get_tx_probs
(
max_tx_size
,
ctx
,
&
cm
->
fc
.
tx_probs
);
TX_SIZE
tx_size
=
vp9_read
(
r
,
tx_probs
[
0
]);
if
(
tx_size
!=
TX_4X4
&&
max_tx_size
>=
TX_16X16
)
{
...
...
vp9/encoder/vp9_encodeframe.c
View file @
cb92f4f0
...
...
@@ -2589,9 +2589,8 @@ static void encode_superblock(VP9_COMP *cpi, TOKENEXTRA **t, int output_enabled,
!
(
is_inter_block
(
mbmi
)
&&
(
mbmi
->
skip_coeff
||
vp9_segfeature_active
(
&
cm
->
seg
,
segment_id
,
SEG_LVL_SKIP
))))
{
const
uint8_t
context
=
vp9_get_pred_context_tx_size
(
xd
);
++
get_tx_counts
(
max_txsize_lookup
[
bsize
],
context
,
&
cm
->
counts
.
tx
)[
mbmi
->
tx_size
];
++
get_tx_counts
(
max_txsize_lookup
[
bsize
],
vp9_get_tx_size_context
(
xd
),
&
cm
->
counts
.
tx
)[
mbmi
->
tx_size
];
}
else
{
int
x
,
y
;
TX_SIZE
tx_size
;
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a 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