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
Xiph.Org
aom-rav1e
Commits
35ce4eb0
Commit
35ce4eb0
authored
Sep 16, 2011
by
John Koleszar
Committed by
Gerrit Code Review
Sep 16, 2011
Browse files
Merge "Fixes the boundary checks for extrapolated and interpolated MVs."
parents
e47306eb
b854bbd8
Changes
1
Show whitespace changes
Inline
Side-by-side
vp8/decoder/error_concealment.c
View file @
35ce4eb0
...
@@ -285,22 +285,31 @@ static void estimate_mb_mvs(const B_OVERLAP *block_overlaps,
...
@@ -285,22 +285,31 @@ static void estimate_mb_mvs(const B_OVERLAP *block_overlaps,
int
mb_to_top_edge
,
int
mb_to_top_edge
,
int
mb_to_bottom_edge
)
int
mb_to_bottom_edge
)
{
{
int
i
;
int
row
,
col
;
int
non_zero_count
=
0
;
int
non_zero_count
=
0
;
MV
*
const
filtered_mv
=
&
(
mi
->
mbmi
.
mv
.
as_mv
);
MV
*
const
filtered_mv
=
&
(
mi
->
mbmi
.
mv
.
as_mv
);
union
b_mode_info
*
const
bmi
=
mi
->
bmi
;
union
b_mode_info
*
const
bmi
=
mi
->
bmi
;
filtered_mv
->
col
=
0
;
filtered_mv
->
col
=
0
;
filtered_mv
->
row
=
0
;
filtered_mv
->
row
=
0
;
for
(
i
=
0
;
i
<
16
;
++
i
)
mi
->
mbmi
.
need_to_clamp_mvs
=
0
;
for
(
row
=
0
;
row
<
4
;
++
row
)
{
int
this_b_to_top_edge
=
mb_to_top_edge
+
((
row
*
4
)
<<
3
);
int
this_b_to_bottom_edge
=
mb_to_bottom_edge
-
((
row
*
4
)
<<
3
);
for
(
col
=
0
;
col
<
4
;
++
col
)
{
{
/* Estimate vectors for all blocks which are overlapped by this type */
int
i
=
row
*
4
+
col
;
/* Interpolate/extrapolate the rest of the block's MVs */
int
this_b_to_left_edge
=
mb_to_left_edge
+
((
col
*
4
)
<<
3
);
int
this_b_to_right_edge
=
mb_to_right_edge
-
((
col
*
4
)
<<
3
);
/* Estimate vectors for all blocks which are overlapped by this */
/* type. Interpolate/extrapolate the rest of the block's MVs */
estimate_mv
(
block_overlaps
[
i
].
overlaps
,
&
(
bmi
[
i
]));
estimate_mv
(
block_overlaps
[
i
].
overlaps
,
&
(
bmi
[
i
]));
mi
->
mbmi
.
need_to_clamp_mvs
=
vp8_check_mv_bounds
(
&
bmi
[
i
].
mv
,
mi
->
mbmi
.
need_to_clamp_mvs
|=
vp8_check_mv_bounds
(
mb_to_left_edge
,
&
bmi
[
i
].
mv
,
mb_to_right_edge
,
this_b_to_left_edge
,
mb_to_top_edge
,
this_b_to_right_edge
,
mb_to_bottom_edge
);
this_b_to_top_edge
,
this_b_to_bottom_edge
);
if
(
bmi
[
i
].
mv
.
as_int
!=
0
)
if
(
bmi
[
i
].
mv
.
as_int
!=
0
)
{
{
++
non_zero_count
;
++
non_zero_count
;
...
@@ -308,6 +317,7 @@ static void estimate_mb_mvs(const B_OVERLAP *block_overlaps,
...
@@ -308,6 +317,7 @@ static void estimate_mb_mvs(const B_OVERLAP *block_overlaps,
filtered_mv
->
row
+=
bmi
[
i
].
mv
.
as_mv
.
row
;
filtered_mv
->
row
+=
bmi
[
i
].
mv
.
as_mv
.
row
;
}
}
}
}
}
if
(
non_zero_count
>
0
)
if
(
non_zero_count
>
0
)
{
{
filtered_mv
->
col
/=
non_zero_count
;
filtered_mv
->
col
/=
non_zero_count
;
...
@@ -527,14 +537,20 @@ static void interpolate_mvs(MACROBLOCKD *mb,
...
@@ -527,14 +537,20 @@ static void interpolate_mvs(MACROBLOCKD *mb,
{
4
,
4
},
{
4
,
3
},
{
4
,
2
},
{
4
,
1
},
{
4
,
0
},
{
4
,
4
},
{
4
,
3
},
{
4
,
2
},
{
4
,
1
},
{
4
,
0
},
{
4
,
-
1
},
{
3
,
-
1
},
{
2
,
-
1
},
{
1
,
-
1
},
{
0
,
-
1
}
{
4
,
-
1
},
{
3
,
-
1
},
{
2
,
-
1
},
{
1
,
-
1
},
{
0
,
-
1
}
};
};
mi
->
mbmi
.
need_to_clamp_mvs
=
0
;
for
(
row
=
0
;
row
<
4
;
++
row
)
for
(
row
=
0
;
row
<
4
;
++
row
)
{
{
int
mb_to_top_edge
=
mb
->
mb_to_top_edge
+
((
row
*
4
)
<<
3
);
int
mb_to_bottom_edge
=
mb
->
mb_to_bottom_edge
-
((
row
*
4
)
<<
3
);
for
(
col
=
0
;
col
<
4
;
++
col
)
for
(
col
=
0
;
col
<
4
;
++
col
)
{
{
int
mb_to_left_edge
=
mb
->
mb_to_left_edge
+
((
col
*
4
)
<<
3
);
int
mb_to_right_edge
=
mb
->
mb_to_right_edge
-
((
col
*
4
)
<<
3
);
int
w_sum
=
0
;
int
w_sum
=
0
;
int
mv_row_sum
=
0
;
int
mv_row_sum
=
0
;
int
mv_col_sum
=
0
;
int
mv_col_sum
=
0
;
int_mv
*
const
mv
=
&
(
mi
->
bmi
[
row
*
4
+
col
].
mv
);
int_mv
*
const
mv
=
&
(
mi
->
bmi
[
row
*
4
+
col
].
mv
);
mv
->
as_int
=
0
;
for
(
i
=
0
;
i
<
NUM_NEIGHBORS
;
++
i
)
for
(
i
=
0
;
i
<
NUM_NEIGHBORS
;
++
i
)
{
{
/* Calculate the weighted sum of neighboring MVs referring
/* Calculate the weighted sum of neighboring MVs referring
...
@@ -557,17 +573,12 @@ static void interpolate_mvs(MACROBLOCKD *mb,
...
@@ -557,17 +573,12 @@ static void interpolate_mvs(MACROBLOCKD *mb,
*/
*/
mv
->
as_mv
.
row
=
mv_row_sum
/
w_sum
;
mv
->
as_mv
.
row
=
mv_row_sum
/
w_sum
;
mv
->
as_mv
.
col
=
mv_col_sum
/
w_sum
;
mv
->
as_mv
.
col
=
mv_col_sum
/
w_sum
;
mi
->
mbmi
.
need_to_clamp_mvs
|=
vp8_check_mv_bounds
(
mi
->
mbmi
.
need_to_clamp_mvs
=
vp8_check_mv_bounds
(
mv
,
mv
,
mb
->
mb_to_left_edge
,
mb_to_left_edge
,
mb
->
mb_to_right_edge
,
mb_to_right_edge
,
mb
->
mb_to_top_edge
,
mb_to_top_edge
,
mb
->
mb_to_bottom_edge
);
mb_to_bottom_edge
);
}
else
{
mv
->
as_int
=
0
;
mi
->
mbmi
.
need_to_clamp_mvs
=
0
;
}
}
}
}
}
}
...
...
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