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
5f4722c7
Commit
5f4722c7
authored
Jul 17, 2013
by
Paul Wilkins
Committed by
Gerrit Code Review
Jul 17, 2013
Browse files
Merge "Minor cleanup in code to fine uv tx_size."
parents
6638b6f6
30d2ea45
Changes
2
Hide whitespace changes
Inline
Side-by-side
vp9/common/vp9_blockd.h
View file @
5f4722c7
...
...
@@ -389,9 +389,7 @@ static void setup_block_dptrs(MACROBLOCKD *xd, int ss_x, int ss_y) {
static
INLINE
TX_SIZE
get_uv_tx_size
(
const
MB_MODE_INFO
*
mbmi
)
{
const
TX_SIZE
size
=
mbmi
->
txfm_size
;
const
TX_SIZE
max_size
=
max_uv_txsize_lookup
[
mbmi
->
sb_type
];
return
(
size
>
max_size
?
max_size
:
size
);
return
MIN
(
mbmi
->
txfm_size
,
max_uv_txsize_lookup
[
mbmi
->
sb_type
]);
}
struct
plane_block_idx
{
...
...
vp9/encoder/vp9_rdopt.c
View file @
5f4722c7
...
...
@@ -3330,13 +3330,7 @@ int64_t vp9_rd_pick_inter_mode_sb(VP9_COMP *cpi, MACROBLOCK *x,
if
(
rate_y
==
INT_MAX
)
continue
;
uv_tx
=
mbmi
->
txfm_size
;
if
(
bsize
<
BLOCK_SIZE_MB16X16
&&
uv_tx
==
TX_8X8
)
uv_tx
=
TX_4X4
;
if
(
bsize
<
BLOCK_SIZE_SB32X32
&&
uv_tx
==
TX_16X16
)
uv_tx
=
TX_8X8
;
else
if
(
bsize
<
BLOCK_SIZE_SB64X64
&&
uv_tx
==
TX_32X32
)
uv_tx
=
TX_16X16
;
uv_tx
=
MIN
(
mbmi
->
txfm_size
,
max_uv_txsize_lookup
[
bsize
]);
rate_uv
=
rate_uv_intra
[
uv_tx
];
distortion_uv
=
dist_uv
[
uv_tx
];
...
...
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