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
2c95a3f3
Commit
2c95a3f3
authored
Nov 05, 2014
by
Hui Su
Committed by
Gerrit Code Review
Nov 05, 2014
Browse files
Merge "Simplify interface of write_selected_tx_size and read_tx_size"
parents
a7889cac
709c634b
Changes
2
Hide whitespace changes
Inline
Side-by-side
vp9/decoder/vp9_decodemv.c
View file @
2c95a3f3
...
...
@@ -74,8 +74,10 @@ static TX_SIZE read_selected_tx_size(VP9_COMMON *cm, MACROBLOCKD *xd,
return
(
TX_SIZE
)
tx_size
;
}
static
TX_SIZE
read_tx_size
(
VP9_COMMON
*
cm
,
MACROBLOCKD
*
xd
,
TX_MODE
tx_mode
,
BLOCK_SIZE
bsize
,
int
allow_select
,
vp9_reader
*
r
)
{
static
TX_SIZE
read_tx_size
(
VP9_COMMON
*
cm
,
MACROBLOCKD
*
xd
,
int
allow_select
,
vp9_reader
*
r
)
{
TX_MODE
tx_mode
=
cm
->
tx_mode
;
BLOCK_SIZE
bsize
=
xd
->
mi
[
0
].
src_mi
->
mbmi
.
sb_type
;
const
TX_SIZE
max_tx_size
=
max_txsize_lookup
[
bsize
];
if
(
allow_select
&&
tx_mode
==
TX_MODE_SELECT
&&
bsize
>=
BLOCK_8X8
)
return
read_selected_tx_size
(
cm
,
xd
,
max_tx_size
,
r
);
...
...
@@ -169,7 +171,7 @@ static void read_intra_frame_mode_info(VP9_COMMON *const cm,
mbmi
->
segment_id
=
read_intra_segment_id
(
cm
,
xd
,
mi_row
,
mi_col
,
r
);
mbmi
->
skip
=
read_skip
(
cm
,
xd
,
mbmi
->
segment_id
,
r
);
mbmi
->
tx_size
=
read_tx_size
(
cm
,
xd
,
cm
->
tx_mode
,
bsize
,
1
,
r
);
mbmi
->
tx_size
=
read_tx_size
(
cm
,
xd
,
1
,
r
);
mbmi
->
ref_frame
[
0
]
=
INTRA_FRAME
;
mbmi
->
ref_frame
[
1
]
=
NONE
;
...
...
@@ -531,8 +533,7 @@ static void read_inter_frame_mode_info(VP9_COMMON *const cm,
mbmi
->
segment_id
=
read_inter_segment_id
(
cm
,
xd
,
mi_row
,
mi_col
,
r
);
mbmi
->
skip
=
read_skip
(
cm
,
xd
,
mbmi
->
segment_id
,
r
);
inter_block
=
read_is_inter_block
(
cm
,
xd
,
mbmi
->
segment_id
,
r
);
mbmi
->
tx_size
=
read_tx_size
(
cm
,
xd
,
cm
->
tx_mode
,
mbmi
->
sb_type
,
!
mbmi
->
skip
||
!
inter_block
,
r
);
mbmi
->
tx_size
=
read_tx_size
(
cm
,
xd
,
!
mbmi
->
skip
||
!
inter_block
,
r
);
if
(
inter_block
)
read_inter_block_mode_info
(
cm
,
xd
,
tile
,
mi
,
mi_row
,
mi_col
,
r
);
...
...
vp9/encoder/vp9_bitstream.c
View file @
2c95a3f3
...
...
@@ -79,9 +79,9 @@ static void prob_diff_update(const vp9_tree_index *tree,
}
static
void
write_selected_tx_size
(
const
VP9_COMMON
*
cm
,
const
MACROBLOCKD
*
xd
,
TX_SIZE
tx_size
,
BLOCK_SIZE
b
size
,
vp9_writer
*
w
)
{
const
MACROBLOCKD
*
xd
,
vp9_writer
*
w
)
{
TX_SIZE
tx_size
=
xd
->
mi
[
0
].
src_mi
->
mbmi
.
tx_
size
;
BLOCK_SIZE
bsize
=
xd
->
mi
[
0
].
src_mi
->
mbmi
.
sb_type
;
const
TX_SIZE
max_tx_size
=
max_txsize_lookup
[
bsize
];
const
vp9_prob
*
const
tx_probs
=
get_tx_probs2
(
max_tx_size
,
xd
,
&
cm
->
fc
->
tx_probs
);
...
...
@@ -270,7 +270,7 @@ static void pack_inter_mode_mvs(VP9_COMP *cpi, const MODE_INFO *mi,
if
(
bsize
>=
BLOCK_8X8
&&
cm
->
tx_mode
==
TX_MODE_SELECT
&&
!
(
is_inter
&&
(
skip
||
vp9_segfeature_active
(
seg
,
segment_id
,
SEG_LVL_SKIP
))))
{
write_selected_tx_size
(
cm
,
xd
,
mbmi
->
tx_size
,
bsize
,
w
);
write_selected_tx_size
(
cm
,
xd
,
w
);
}
if
(
!
is_inter
)
{
...
...
@@ -356,7 +356,7 @@ static void write_mb_modes_kf(const VP9_COMMON *cm, const MACROBLOCKD *xd,
write_skip
(
cm
,
xd
,
mbmi
->
segment_id
,
mi
,
w
);
if
(
bsize
>=
BLOCK_8X8
&&
cm
->
tx_mode
==
TX_MODE_SELECT
)
write_selected_tx_size
(
cm
,
xd
,
mbmi
->
tx_size
,
bsize
,
w
);
write_selected_tx_size
(
cm
,
xd
,
w
);
if
(
bsize
>=
BLOCK_8X8
)
{
write_intra_mode
(
w
,
mbmi
->
mode
,
get_y_mode_probs
(
mi
,
above_mi
,
left_mi
,
0
));
...
...
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