Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
BC
public
external
libvpx
Commits
07dddfa3
Commit
07dddfa3
authored
Apr 14, 2014
by
Dmitry Kovalev
Committed by
Gerrit Code Review
Apr 14, 2014
Browse files
Merge "Cleaning up check_best_zero_mv()."
parents
25435257
35a63b7c
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
18 additions
and
18 deletions
+18
-18
vp9/encoder/vp9_rdopt.c
vp9/encoder/vp9_rdopt.c
+18
-18
No files found.
vp9/encoder/vp9_rdopt.c
View file @
07dddfa3
...
...
@@ -1677,14 +1677,14 @@ static INLINE int mv_has_subpel(const MV *mv) {
static
int
check_best_zero_mv
(
const
VP9_COMP
*
cpi
,
const
uint8_t
mode_context
[
MAX_REF_FRAMES
],
int_mv
frame_mv
[
MB_MODE_COUNT
][
MAX_REF_FRAMES
],
int
disable_inter_mode_mask
,
int
this_mode
,
int
ref_frame
,
int
second_
ref_frame
)
{
int
disable_inter_mode_mask
,
int
this_mode
,
const
MV_REFERENCE_FRAME
ref_frame
s
[
2
]
)
{
if
(
!
(
disable_inter_mode_mask
&
(
1
<<
INTER_OFFSET
(
ZEROMV
)))
&&
(
this_mode
==
NEARMV
||
this_mode
==
NEARESTMV
||
this_mode
==
ZEROMV
)
&&
frame_mv
[
this_mode
][
ref_frame
].
as_int
==
0
&&
(
second_
ref_frame
==
NONE
||
frame_mv
[
this_mode
][
second_
ref_frame
].
as_int
==
0
))
{
int
rfc
=
mode_context
[
ref_frame
];
frame_mv
[
this_mode
][
ref_frame
s
[
0
]
].
as_int
==
0
&&
(
ref_frame
s
[
1
]
==
NONE
||
frame_mv
[
this_mode
][
ref_frame
s
[
1
]
].
as_int
==
0
))
{
int
rfc
=
mode_context
[
ref_frame
s
[
0
]
];
int
c1
=
cost_mv_ref
(
cpi
,
NEARMV
,
rfc
);
int
c2
=
cost_mv_ref
(
cpi
,
NEARESTMV
,
rfc
);
int
c3
=
cost_mv_ref
(
cpi
,
ZEROMV
,
rfc
);
...
...
@@ -1695,15 +1695,15 @@ static int check_best_zero_mv(
if
(
c2
>
c3
)
return
0
;
}
else
{
assert
(
this_mode
==
ZEROMV
);
if
(
second_
ref_frame
==
NONE
)
{
if
((
c3
>=
c2
&&
frame_mv
[
NEARESTMV
][
ref_frame
].
as_int
==
0
)
||
(
c3
>=
c1
&&
frame_mv
[
NEARMV
][
ref_frame
].
as_int
==
0
))
if
(
ref_frame
s
[
1
]
==
NONE
)
{
if
((
c3
>=
c2
&&
frame_mv
[
NEARESTMV
][
ref_frame
s
[
0
]
].
as_int
==
0
)
||
(
c3
>=
c1
&&
frame_mv
[
NEARMV
][
ref_frame
s
[
0
]
].
as_int
==
0
))
return
0
;
}
else
{
if
((
c3
>=
c2
&&
frame_mv
[
NEARESTMV
][
ref_frame
].
as_int
==
0
&&
frame_mv
[
NEARESTMV
][
second_
ref_frame
].
as_int
==
0
)
||
(
c3
>=
c1
&&
frame_mv
[
NEARMV
][
ref_frame
].
as_int
==
0
&&
frame_mv
[
NEARMV
][
second_
ref_frame
].
as_int
==
0
))
if
((
c3
>=
c2
&&
frame_mv
[
NEARESTMV
][
ref_frame
s
[
0
]
].
as_int
==
0
&&
frame_mv
[
NEARESTMV
][
ref_frame
s
[
1
]
].
as_int
==
0
)
||
(
c3
>=
c1
&&
frame_mv
[
NEARMV
][
ref_frame
s
[
0
]
].
as_int
==
0
&&
frame_mv
[
NEARMV
][
ref_frame
s
[
1
]
].
as_int
==
0
))
return
0
;
}
}
...
...
@@ -1781,8 +1781,7 @@ static void rd_check_segment_txsize(VP9_COMP *cpi, MACROBLOCK *x,
if
(
!
check_best_zero_mv
(
cpi
,
mbmi
->
mode_context
,
frame_mv
,
disable_inter_mode_mask
,
this_mode
,
mbmi
->
ref_frame
[
0
],
mbmi
->
ref_frame
[
1
]))
this_mode
,
mbmi
->
ref_frame
))
continue
;
vpx_memcpy
(
orig_pre
,
pd
->
pre
,
sizeof
(
orig_pre
));
...
...
@@ -3379,11 +3378,12 @@ int64_t vp9_rd_pick_inter_mode_sb(VP9_COMP *cpi, MACROBLOCK *x,
}
}
else
{
if
(
x
->
in_active_map
&&
!
vp9_segfeature_active
(
&
cm
->
seg
,
mbmi
->
segment_id
,
SEG_LVL_SKIP
))
!
vp9_segfeature_active
(
&
cm
->
seg
,
mbmi
->
segment_id
,
SEG_LVL_SKIP
))
{
const
MV_REFERENCE_FRAME
ref_frames
[
2
]
=
{
ref_frame
,
second_ref_frame
};
if
(
!
check_best_zero_mv
(
cpi
,
mbmi
->
mode_context
,
frame_mv
,
disable_inter_mode_mask
,
this_mode
,
ref_frame
,
second_ref_frame
))
disable_inter_mode_mask
,
this_mode
,
ref_frames
))
continue
;
}
}
mbmi
->
mode
=
this_mode
;
...
...
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