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
Yushin Cho
aom-rav1e
Commits
632289b3
Commit
632289b3
authored
Jul 01, 2013
by
Yaowu Xu
Browse files
fix a mismatch in cpuused 2
Change-Id: I921c9faba6386535aaf717a54301dd346a9b8540
parent
993942ce
Changes
1
Hide whitespace changes
Inline
Side-by-side
vp9/encoder/vp9_encodeframe.c
View file @
632289b3
...
...
@@ -1208,8 +1208,8 @@ static void rd_use_partition(VP9_COMP *cpi, MODE_INFO *m, TOKENEXTRA **tp,
pick_sb_modes
(
cpi
,
mi_row
,
mi_col
,
tp
,
&
r
,
&
d
,
subsize
,
get_block_context
(
x
,
subsize
));
if
(
mi_row
+
(
bh
>>
1
)
<=
cm
->
mi_rows
)
{
int
rt
;
int64_t
dt
;
int
rt
=
0
;
int64_t
dt
=
0
;
update_state
(
cpi
,
get_block_context
(
x
,
subsize
),
subsize
,
0
);
encode_superblock
(
cpi
,
tp
,
0
,
mi_row
,
mi_col
,
subsize
);
*
(
get_sb_index
(
xd
,
subsize
))
=
1
;
...
...
@@ -1227,8 +1227,8 @@ static void rd_use_partition(VP9_COMP *cpi, MODE_INFO *m, TOKENEXTRA **tp,
pick_sb_modes
(
cpi
,
mi_row
,
mi_col
,
tp
,
&
r
,
&
d
,
subsize
,
get_block_context
(
x
,
subsize
));
if
(
mi_col
+
(
bs
>>
1
)
<=
cm
->
mi_cols
)
{
int
rt
;
int64_t
dt
;
int
rt
=
0
;
int64_t
dt
=
0
;
update_state
(
cpi
,
get_block_context
(
x
,
subsize
),
subsize
,
0
);
encode_superblock
(
cpi
,
tp
,
0
,
mi_row
,
mi_col
,
subsize
);
*
(
get_sb_index
(
xd
,
subsize
))
=
1
;
...
...
@@ -1247,8 +1247,8 @@ static void rd_use_partition(VP9_COMP *cpi, MODE_INFO *m, TOKENEXTRA **tp,
int
x_idx
=
(
i
&
1
)
*
(
bs
>>
2
);
int
y_idx
=
(
i
>>
1
)
*
(
bs
>>
2
);
int
jj
=
i
>>
1
,
ii
=
i
&
0x01
;
int
rt
;
int64_t
dt
;
int
rt
=
0
;
int64_t
dt
=
0
;
if
((
mi_row
+
y_idx
>=
cm
->
mi_rows
)
||
(
mi_col
+
x_idx
>=
cm
->
mi_cols
))
continue
;
...
...
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