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
c0f70cca
Commit
c0f70cca
authored
May 16, 2013
by
Jingning Han
Committed by
Gerrit Code Review
May 16, 2013
Browse files
Merge "Fix the transform type selection in 4x4 partition" into experimental
parents
18e07420
8468a5c1
Changes
2
Hide whitespace changes
Inline
Side-by-side
vp9/common/vp9_blockd.h
View file @
c0f70cca
...
...
@@ -625,13 +625,11 @@ static TX_TYPE get_tx_type_4x4(const MACROBLOCKD *xd, int ib) {
// is smaller than the prediction size
TX_TYPE
tx_type
=
DCT_DCT
;
const
BLOCK_SIZE_TYPE
sb_type
=
xd
->
mode_info_context
->
mbmi
.
sb_type
;
const
int
wb
=
b_width_log2
(
sb_type
)
,
hb
=
b_height_log2
(
sb_type
)
;
const
int
wb
=
b_width_log2
(
sb_type
);
#if !USE_ADST_FOR_SB
if
(
sb_type
>
BLOCK_SIZE_MB16X16
)
return
tx_type
;
#endif
if
(
ib
>=
(
1
<<
(
wb
+
hb
)))
// no chroma adst
return
tx_type
;
if
(
xd
->
lossless
)
return
DCT_DCT
;
if
(
xd
->
mode_info_context
->
mbmi
.
mode
==
I4X4_PRED
&&
...
...
vp9/encoder/vp9_rdopt.c
View file @
c0f70cca
...
...
@@ -2331,8 +2331,7 @@ void vp9_rd_pick_intra_mode_sb(VP9_COMP *cpi, MACROBLOCK *x,
*
returnrate
=
rate_y
+
rate_uv
-
rate_y_tokenonly
-
rate_uv_tokenonly
+
vp9_cost_bit
(
vp9_get_pred_prob
(
cm
,
xd
,
PRED_MBSKIP
),
1
);
*
returndist
=
dist_y
+
(
dist_uv
>>
2
);
memset
(
ctx
->
txfm_rd_diff
,
0
,
sizeof
(
x
->
sb32_context
[
xd
->
sb_index
].
txfm_rd_diff
));
memset
(
ctx
->
txfm_rd_diff
,
0
,
sizeof
(
ctx
->
txfm_rd_diff
));
xd
->
mode_info_context
->
mbmi
.
mode
=
mode
;
xd
->
mode_info_context
->
mbmi
.
txfm_size
=
txfm_size
;
#if CONFIG_AB4X4
...
...
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