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
Guillaume Martres
aom-rav1e
Commits
f32fa45c
Commit
f32fa45c
authored
Feb 05, 2014
by
Dmitry Kovalev
Committed by
Gerrit Code Review
Feb 05, 2014
Browse files
Merge "Cleaning up vp9_get_pred_context_single_ref_p1()."
parents
4a1a7919
724fefb4
Changes
1
Hide whitespace changes
Inline
Side-by-side
vp9/common/vp9_pred_common.c
View file @
f32fa45c
...
...
@@ -218,27 +218,25 @@ int vp9_get_pred_context_single_ref_p1(const MACROBLOCKD *xd) {
}
else
{
// inter/inter
const
int
above_has_second
=
has_second_ref
(
above_mbmi
);
const
int
left_has_second
=
has_second_ref
(
left_mbmi
);
const
MV_REFERENCE_FRAME
above0
=
above_mbmi
->
ref_frame
[
0
];
const
MV_REFERENCE_FRAME
above1
=
above_mbmi
->
ref_frame
[
1
];
const
MV_REFERENCE_FRAME
left0
=
left_mbmi
->
ref_frame
[
0
];
const
MV_REFERENCE_FRAME
left1
=
left_mbmi
->
ref_frame
[
1
];
if
(
above_has_second
&&
left_has_second
)
{
pred_context
=
1
+
(
above_mbmi
->
ref_frame
[
0
]
==
LAST_FRAME
||
above_mbmi
->
ref_frame
[
1
]
==
LAST_FRAME
||
left_mbmi
->
ref_frame
[
0
]
==
LAST_FRAME
||
left_mbmi
->
ref_frame
[
1
]
==
LAST_FRAME
);
pred_context
=
1
+
(
above0
==
LAST_FRAME
||
above1
==
LAST_FRAME
||
left0
==
LAST_FRAME
||
left1
==
LAST_FRAME
);
}
else
if
(
above_has_second
||
left_has_second
)
{
const
MV_REFERENCE_FRAME
rfs
=
!
above_has_second
?
above_mbmi
->
ref_frame
[
0
]
:
left_mbmi
->
ref_frame
[
0
];
const
MV_REFERENCE_FRAME
crf1
=
above_has_second
?
above_mbmi
->
ref_frame
[
0
]
:
left_mbmi
->
ref_frame
[
0
];
const
MV_REFERENCE_FRAME
crf2
=
above_has_second
?
above_mbmi
->
ref_frame
[
1
]
:
left_mbmi
->
ref_frame
[
1
];
const
MV_REFERENCE_FRAME
rfs
=
!
above_has_second
?
above0
:
left0
;
const
MV_REFERENCE_FRAME
crf1
=
above_has_second
?
above0
:
left0
;
const
MV_REFERENCE_FRAME
crf2
=
above_has_second
?
above1
:
left1
;
if
(
rfs
==
LAST_FRAME
)
pred_context
=
3
+
(
crf1
==
LAST_FRAME
||
crf2
==
LAST_FRAME
);
else
pred_context
=
(
crf1
==
LAST_FRAME
||
crf2
==
LAST_FRAME
);
}
else
{
pred_context
=
2
*
(
above_mbmi
->
ref_frame
[
0
]
==
LAST_FRAME
)
+
2
*
(
left_mbmi
->
ref_frame
[
0
]
==
LAST_FRAME
);
pred_context
=
2
*
(
above0
==
LAST_FRAME
)
+
2
*
(
left0
==
LAST_FRAME
);
}
}
}
else
if
(
has_above
||
has_left
)
{
// one edge available
...
...
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