Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
Xiph.Org
aom-rav1e
Commits
d63826ac
Commit
d63826ac
authored
Apr 17, 2013
by
Ronald S. Bultje
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix edge bug in recent merge of 64x64 and 32x32 inter predictors.
Change-Id: I83aa188d414922db19cccb210c4001c02d5a404c
parent
0a20625b
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
16 additions
and
16 deletions
+16
-16
vp9/common/vp9_reconinter.c
vp9/common/vp9_reconinter.c
+16
-16
No files found.
vp9/common/vp9_reconinter.c
View file @
d63826ac
...
...
@@ -1068,10 +1068,10 @@ static void build_inter_predictors_sby_w(MACROBLOCKD *x,
for
(
n
=
0
;
n
<
bw
*
bh
;
n
++
)
{
const
int
x_idx
=
n
&
(
bw
-
1
),
y_idx
=
n
>>
bwl
;
x
->
mb_to_top_edge
=
edge
[
0
]
-
((
y_idx
*
16
)
<<
3
);
x
->
mb_to_bottom_edge
=
edge
[
1
]
+
(((
1
-
y_idx
)
*
16
)
<<
3
);
x
->
mb_to_left_edge
=
edge
[
2
]
-
((
x_idx
*
16
)
<<
3
);
x
->
mb_to_right_edge
=
edge
[
3
]
+
(((
1
-
x_idx
)
*
16
)
<<
3
);
x
->
mb_to_top_edge
=
edge
[
0
]
-
((
y_idx
*
16
)
<<
3
);
x
->
mb_to_bottom_edge
=
edge
[
1
]
+
(((
bh
-
1
-
y_idx
)
*
16
)
<<
3
);
x
->
mb_to_left_edge
=
edge
[
2
]
-
((
x_idx
*
16
)
<<
3
);
x
->
mb_to_right_edge
=
edge
[
3
]
+
(((
bw
-
1
-
x_idx
)
*
16
)
<<
3
);
x
->
pre
.
y_buffer
=
y1
+
scaled_buffer_offset
(
x_idx
*
16
,
y_idx
*
16
,
...
...
@@ -1136,10 +1136,10 @@ void vp9_build_inter_predictors_sby(MACROBLOCKD *x,
for
(
n
=
0
;
n
<
bw
*
bh
;
n
++
)
{
const
int
x_idx
=
n
&
(
bw
-
1
),
y_idx
=
n
>>
bwl
;
x
->
mb_to_top_edge
=
edge
[
0
]
-
((
y_idx
*
16
)
<<
3
);
x
->
mb_to_bottom_edge
=
edge
[
1
]
+
(((
1
-
y_idx
)
*
16
)
<<
3
);
x
->
mb_to_left_edge
=
edge
[
2
]
-
((
x_idx
*
16
)
<<
3
);
x
->
mb_to_right_edge
=
edge
[
3
]
+
(((
1
-
x_idx
)
*
16
)
<<
3
);
x
->
mb_to_top_edge
=
edge
[
0
]
-
((
y_idx
*
16
)
<<
3
);
x
->
mb_to_bottom_edge
=
edge
[
1
]
+
(((
bh
-
1
-
y_idx
)
*
16
)
<<
3
);
x
->
mb_to_left_edge
=
edge
[
2
]
-
((
x_idx
*
16
)
<<
3
);
x
->
mb_to_right_edge
=
edge
[
3
]
+
(((
bw
-
1
-
x_idx
)
*
16
)
<<
3
);
x
->
pre
.
y_buffer
=
y1
+
scaled_buffer_offset
(
x_idx
*
16
,
y_idx
*
16
,
...
...
@@ -1193,10 +1193,10 @@ static void build_inter_predictors_sbuv_w(MACROBLOCKD *x,
int
scaled_uv_offset
;
const
int
x_idx
=
n
&
(
bw
-
1
),
y_idx
=
n
>>
bwl
;
x
->
mb_to_top_edge
=
edge
[
0
]
-
((
y_idx
*
16
)
<<
3
);
x
->
mb_to_bottom_edge
=
edge
[
1
]
+
(((
1
-
y_idx
)
*
16
)
<<
3
);
x
->
mb_to_left_edge
=
edge
[
2
]
-
((
x_idx
*
16
)
<<
3
);
x
->
mb_to_right_edge
=
edge
[
3
]
+
(((
1
-
x_idx
)
*
16
)
<<
3
);
x
->
mb_to_top_edge
=
edge
[
0
]
-
((
y_idx
*
16
)
<<
3
);
x
->
mb_to_bottom_edge
=
edge
[
1
]
+
(((
bh
-
1
-
y_idx
)
*
16
)
<<
3
);
x
->
mb_to_left_edge
=
edge
[
2
]
-
((
x_idx
*
16
)
<<
3
);
x
->
mb_to_right_edge
=
edge
[
3
]
+
(((
bw
-
1
-
x_idx
)
*
16
)
<<
3
);
scaled_uv_offset
=
scaled_buffer_offset
(
x_idx
*
8
,
y_idx
*
8
,
...
...
@@ -1273,10 +1273,10 @@ void vp9_build_inter_predictors_sbuv(MACROBLOCKD *x,
int
scaled_uv_offset
;
const
int
x_idx
=
n
&
(
bw
-
1
),
y_idx
=
n
>>
bwl
;
x
->
mb_to_top_edge
=
edge
[
0
]
-
((
y_idx
*
16
)
<<
3
);
x
->
mb_to_bottom_edge
=
edge
[
1
]
+
(((
1
-
y_idx
)
*
16
)
<<
3
);
x
->
mb_to_left_edge
=
edge
[
2
]
-
((
x_idx
*
16
)
<<
3
);
x
->
mb_to_right_edge
=
edge
[
3
]
+
(((
1
-
x_idx
)
*
16
)
<<
3
);
x
->
mb_to_top_edge
=
edge
[
0
]
-
((
y_idx
*
16
)
<<
3
);
x
->
mb_to_bottom_edge
=
edge
[
1
]
+
(((
bh
-
1
-
y_idx
)
*
16
)
<<
3
);
x
->
mb_to_left_edge
=
edge
[
2
]
-
((
x_idx
*
16
)
<<
3
);
x
->
mb_to_right_edge
=
edge
[
3
]
+
(((
bw
-
1
-
x_idx
)
*
16
)
<<
3
);
scaled_uv_offset
=
scaled_buffer_offset
(
x_idx
*
8
,
y_idx
*
8
,
...
...
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