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
153d70ca
Commit
153d70ca
authored
Oct 24, 2013
by
Dmitry Kovalev
Committed by
Gerrit Code Review
Oct 24, 2013
Browse files
Merge "Cleaning up {above, left}_block_mode functions."
parents
93ec31df
5d28b636
Changes
1
Hide whitespace changes
Inline
Side-by-side
vp9/common/vp9_findnearmv.h
View file @
153d70ca
...
...
@@ -43,42 +43,30 @@ void vp9_append_sub8x8_mvs_for_idx(VP9_COMMON *cm,
static
MB_PREDICTION_MODE
left_block_mode
(
const
MODE_INFO
*
cur_mi
,
const
MODE_INFO
*
left_mi
,
int
b
)
{
// FIXME(rbultje, jingning): temporary hack because jenkins doesn't
// understand this condition. This will go away soon.
if
(
b
==
0
||
b
==
2
)
{
/* On L edge, get from MB to left of us */
if
(
!
left_mi
)
if
(
!
left_mi
||
is_inter_block
(
&
left_mi
->
mbmi
))
return
DC_PRED
;
if
(
is_inter_block
(
&
left_mi
->
mbmi
))
return
DC_PRED
;
else
return
left_mi
->
mbmi
.
sb_type
<
BLOCK_8X8
?
left_mi
->
bmi
[
b
+
1
].
as_mode
:
left
_mi
->
m
bmi
.
mode
;
return
left_mi
->
mbmi
.
sb_type
<
BLOCK_8X8
?
left_mi
->
bmi
[
b
+
1
].
as_mode
:
left_mi
->
mbmi
.
mode
;
}
else
{
assert
(
b
==
1
||
b
==
3
);
return
cur
_mi
->
bmi
[
b
-
1
].
as_
mode
;
}
assert
(
b
==
1
||
b
==
3
);
return
cur_mi
->
bmi
[
b
-
1
].
as_mode
;
}
static
MB_PREDICTION_MODE
above_block_mode
(
const
MODE_INFO
*
cur_mb
,
const
MODE_INFO
*
above_mb
,
int
b
)
{
const
MODE_INFO
*
mi
=
cur_mb
;
if
(
!
(
b
>>
1
))
{
/* On top edge, get from MB above us */
mi
=
above_mb
;
if
(
!
mi
)
static
MB_PREDICTION_MODE
above_block_mode
(
const
MODE_INFO
*
cur_mi
,
const
MODE_INFO
*
above_mi
,
int
b
)
{
if
(
b
==
0
||
b
==
1
)
{
if
(
!
above_mi
||
is_inter_block
(
&
above_mi
->
mbmi
))
return
DC_PRED
;
if
(
is_inter_block
(
&
mi
->
mbmi
))
return
DC_PRED
;
else
return
mi
->
mbmi
.
sb_type
<
BLOCK_8X8
?
(
mi
->
bmi
+
2
+
b
)
->
as_mode
:
mi
->
m
bmi
.
mode
;
return
above_mi
->
mbmi
.
sb_type
<
BLOCK_8X8
?
above_mi
->
bmi
[
b
+
2
].
as_mode
:
above_mi
->
mbmi
.
mode
;
}
else
{
assert
(
b
==
2
||
b
==
3
);
return
cur_
mi
->
bmi
[
b
-
2
].
as_
mode
;
}
return
(
mi
->
bmi
+
b
-
2
)
->
as_mode
;
}
#endif // VP9_COMMON_VP9_FINDNEARMV_H_
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