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
05869759
Commit
05869759
authored
Aug 25, 2014
by
Dmitry Kovalev
Committed by
Gerrit Code Review
Aug 25, 2014
Browse files
Merge "Removing tx_stepdown_count from VP9_COMP."
parents
48edc8df
4478553e
Changes
3
Hide whitespace changes
Inline
Side-by-side
vp9/encoder/vp9_encodeframe.c
View file @
05869759
...
...
@@ -3289,7 +3289,6 @@ static void encode_frame_internal(VP9_COMP *cpi) {
vp9_zero
(
cm
->
counts
);
vp9_zero
(
cpi
->
coef_counts
);
vp9_zero
(
cpi
->
tx_stepdown_count
);
vp9_zero
(
rd_opt
->
comp_pred_diff
);
vp9_zero
(
rd_opt
->
filter_diff
);
vp9_zero
(
rd_opt
->
tx_select_diff
);
...
...
vp9/encoder/vp9_encoder.h
View file @
05869759
...
...
@@ -372,8 +372,6 @@ typedef struct VP9_COMP {
int
dummy_packing
;
/* flag to indicate if packing is dummy */
unsigned
int
tx_stepdown_count
[
TX_SIZES
];
int
initial_width
;
int
initial_height
;
...
...
vp9/encoder/vp9_rdopt.c
View file @
05869759
...
...
@@ -468,7 +468,6 @@ static void choose_largest_tx_size(VP9_COMP *cpi, MACROBLOCK *x,
txfm_rd_in_plane
(
x
,
rate
,
distortion
,
skip
,
sse
,
ref_best_rd
,
0
,
bs
,
mbmi
->
tx_size
,
cpi
->
sf
.
use_fast_coef_costing
);
cpi
->
tx_stepdown_count
[
0
]
++
;
}
static
void
choose_tx_size_from_rd
(
VP9_COMP
*
cpi
,
MACROBLOCK
*
x
,
...
...
@@ -551,16 +550,12 @@ static void choose_tx_size_from_rd(VP9_COMP *cpi, MACROBLOCK *x,
if
(
max_tx_size
==
TX_32X32
&&
best_tx
==
TX_32X32
)
{
tx_cache
[
TX_MODE_SELECT
]
=
rd
[
TX_32X32
][
1
];
cpi
->
tx_stepdown_count
[
0
]
++
;
}
else
if
(
max_tx_size
>=
TX_16X16
&&
best_tx
==
TX_16X16
)
{
tx_cache
[
TX_MODE_SELECT
]
=
rd
[
TX_16X16
][
1
];
cpi
->
tx_stepdown_count
[
max_tx_size
-
TX_16X16
]
++
;
}
else
if
(
rd
[
TX_8X8
][
1
]
<
rd
[
TX_4X4
][
1
])
{
tx_cache
[
TX_MODE_SELECT
]
=
rd
[
TX_8X8
][
1
];
cpi
->
tx_stepdown_count
[
max_tx_size
-
TX_8X8
]
++
;
}
else
{
tx_cache
[
TX_MODE_SELECT
]
=
rd
[
TX_4X4
][
1
];
cpi
->
tx_stepdown_count
[
max_tx_size
-
TX_4X4
]
++
;
}
}
...
...
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