Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
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
16336857
Commit
16336857
authored
Apr 15, 2013
by
Ronald S. Bultje
Committed by
Gerrit Code Review
Apr 15, 2013
Browse files
Merge "Fix lingering x->skip settings if static_threshold is used." into experimental
parents
f7d43d21
33a8df08
Changes
1
Hide whitespace changes
Inline
Side-by-side
vp9/encoder/vp9_rdopt.c
View file @
16336857
...
...
@@ -4169,6 +4169,7 @@ void vp9_rd_pick_intra_mode_sb(VP9_COMP *cpi, MACROBLOCK *x,
int64_t
txfm_cache
[
NB_TXFM_MODES
],
err
;
int
i
;
ctx
->
skip
=
0
;
xd
->
mode_info_context
->
mbmi
.
mode
=
DC_PRED
;
err
=
rd_pick_intra_sby_mode
(
cpi
,
x
,
&
rate_y
,
&
rate_y_tokenonly
,
&
dist_y
,
&
y_skip
,
bsize
,
txfm_cache
);
...
...
@@ -4218,6 +4219,7 @@ void vp9_rd_pick_intra_mode(VP9_COMP *cpi, MACROBLOCK *x,
TX_SIZE
txfm_size_16x16
,
txfm_size_8x8
;
int
i
;
x
->
mb_context
[
xd
->
sb_index
][
xd
->
mb_index
].
skip
=
0
;
mbmi
->
ref_frame
=
INTRA_FRAME
;
mbmi
->
mode
=
DC_PRED
;
for
(
i
=
0
;
i
<=
TX_8X8
;
i
++
)
{
...
...
Write
Preview
Markdown
is supported
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