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
0b769b29
Commit
0b769b29
authored
Jan 05, 2016
by
Yaowu Xu
Committed by
Gerrit Code Review
Jan 05, 2016
Browse files
Merge "vp10: skip coding of txsz for lossless-segment blocks."
parents
e5dfca02
d9439fdc
Changes
2
Hide whitespace changes
Inline
Side-by-side
vp10/decoder/decodemv.c
View file @
0b769b29
...
...
@@ -100,6 +100,8 @@ static TX_SIZE read_tx_size(VP10_COMMON *cm, MACROBLOCKD *xd,
TX_MODE
tx_mode
=
cm
->
tx_mode
;
BLOCK_SIZE
bsize
=
xd
->
mi
[
0
]
->
mbmi
.
sb_type
;
const
TX_SIZE
max_tx_size
=
max_txsize_lookup
[
bsize
];
if
(
xd
->
lossless
[
xd
->
mi
[
0
]
->
mbmi
.
segment_id
])
return
TX_4X4
;
if
(
allow_select
&&
tx_mode
==
TX_MODE_SELECT
&&
bsize
>=
BLOCK_8X8
)
return
read_selected_tx_size
(
cm
,
xd
,
max_tx_size
,
r
);
else
...
...
vp10/encoder/bitstream.c
View file @
0b769b29
...
...
@@ -303,7 +303,7 @@ static void pack_inter_mode_mvs(VP10_COMP *cpi, const MODE_INFO *mi,
vpx_write
(
w
,
is_inter
,
vp10_get_intra_inter_prob
(
cm
,
xd
));
if
(
bsize
>=
BLOCK_8X8
&&
cm
->
tx_mode
==
TX_MODE_SELECT
&&
!
(
is_inter
&&
skip
))
{
!
(
is_inter
&&
skip
)
&&
!
xd
->
lossless
[
segment_id
]
)
{
write_selected_tx_size
(
cm
,
xd
,
w
);
}
...
...
@@ -391,7 +391,8 @@ static void write_mb_modes_kf(const VP10_COMMON *cm, const MACROBLOCKD *xd,
write_skip
(
cm
,
xd
,
mbmi
->
segment_id
,
mi
,
w
);
if
(
bsize
>=
BLOCK_8X8
&&
cm
->
tx_mode
==
TX_MODE_SELECT
)
if
(
bsize
>=
BLOCK_8X8
&&
cm
->
tx_mode
==
TX_MODE_SELECT
&&
!
xd
->
lossless
[
mbmi
->
segment_id
])
write_selected_tx_size
(
cm
,
xd
,
w
);
if
(
bsize
>=
BLOCK_8X8
)
{
...
...
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