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
d5955a42
Commit
d5955a42
authored
Oct 15, 2012
by
Ronald S. Bultje
Committed by
Gerrit Code Review
Oct 15, 2012
Browse files
Merge "Remove test from B_MODE_INFO." into experimental
parents
dd364646
23a64c89
Changes
3
Hide whitespace changes
Inline
Side-by-side
vp8/common/blockd.h
View file @
d5955a42
...
...
@@ -237,7 +237,6 @@ union b_mode_info {
struct
{
B_PREDICTION_MODE
first
;
#if CONFIG_HYBRIDTRANSFORM8X8 || CONFIG_HYBRIDTRANSFORM || CONFIG_HYBRIDTRANSFORM16X16
B_PREDICTION_MODE
test
;
TX_TYPE
tx_type
;
#endif
...
...
vp8/encoder/encodeintra.c
View file @
d5955a42
...
...
@@ -74,7 +74,6 @@ void vp8_encode_intra4x4block(const VP8_ENCODER_RTCD *rtcd,
#if CONFIG_HYBRIDTRANSFORM
if
(
x
->
q_index
<
ACTIVE_HT
)
{
b
->
bmi
.
as_mode
.
test
=
b
->
bmi
.
as_mode
.
first
;
txfm_map
(
b
,
b
->
bmi
.
as_mode
.
first
);
vp8_fht_c
(
be
->
src_diff
,
be
->
coeff
,
32
,
b
->
bmi
.
as_mode
.
tx_type
,
4
);
vp8_ht_quantize_b_4x4
(
be
,
b
);
...
...
vp8/encoder/rdopt.c
View file @
d5955a42
...
...
@@ -1182,6 +1182,7 @@ static int64_t rd_pick_intra4x4block(VP8_COMP *cpi, MACROBLOCK *x, BLOCK *be,
// Do we need to do this for mode2 also?
if
(
mode
==
B_LD_PRED
||
mode
==
B_VL_PRED
)
continue
;
b
->
bmi
.
as_mode
.
first
=
mode
;
rate
=
bmode_costs
[
mode
];
#if CONFIG_COMP_INTRA_PRED
...
...
@@ -1200,7 +1201,6 @@ static int64_t rd_pick_intra4x4block(VP8_COMP *cpi, MACROBLOCK *x, BLOCK *be,
#if CONFIG_HYBRIDTRANSFORM
if
(
active_ht
)
{
b
->
bmi
.
as_mode
.
test
=
mode
;
txfm_map
(
b
,
mode
);
vp8_fht_c
(
be
->
src_diff
,
be
->
coeff
,
32
,
b
->
bmi
.
as_mode
.
tx_type
,
4
);
vp8_ht_quantize_b_4x4
(
be
,
b
);
...
...
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