Skip to content
GitLab
Menu
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
08f250f5
Commit
08f250f5
authored
Feb 26, 2014
by
hkuang
Committed by
Gerrit Code Review
Feb 26, 2014
Browse files
Merge "Fix a bug in intra prediction due to change in
25e55526
."
parents
11bd630f
1c4e4491
Changes
1
Hide whitespace changes
Inline
Side-by-side
vp9/common/vp9_reconintra.c
View file @
08f250f5
...
...
@@ -382,34 +382,34 @@ static void build_intra_predictors(const MACROBLOCKD *xd, const uint8_t *ref,
/* slower path if the block needs border extension */
if
(
x0
+
2
*
bs
<=
frame_width
)
{
if
(
right_available
&&
bs
==
4
)
{
vpx_memcpy
(
above_row
-
1
,
above_ref
-
1
,
2
*
bs
+
1
);
vpx_memcpy
(
above_row
,
above_ref
,
2
*
bs
);
}
else
{
vpx_memcpy
(
above_row
-
1
,
above_ref
-
1
,
bs
+
1
);
vpx_memcpy
(
above_row
,
above_ref
,
bs
);
vpx_memset
(
above_row
+
bs
,
above_row
[
bs
-
1
],
bs
);
}
}
else
if
(
x0
+
bs
<=
frame_width
)
{
const
int
r
=
frame_width
-
x0
;
if
(
right_available
&&
bs
==
4
)
{
vpx_memcpy
(
above_row
-
1
,
above_ref
-
1
,
r
+
1
);
vpx_memcpy
(
above_row
,
above_ref
,
r
);
vpx_memset
(
above_row
+
r
,
above_row
[
r
-
1
],
x0
+
2
*
bs
-
frame_width
);
}
else
{
vpx_memcpy
(
above_row
-
1
,
above_ref
-
1
,
bs
+
1
);
vpx_memcpy
(
above_row
,
above_ref
,
bs
);
vpx_memset
(
above_row
+
bs
,
above_row
[
bs
-
1
],
bs
);
}
}
else
if
(
x0
<=
frame_width
)
{
const
int
r
=
frame_width
-
x0
;
if
(
right_available
&&
bs
==
4
)
{
vpx_memcpy
(
above_row
-
1
,
above_ref
-
1
,
r
+
1
);
vpx_memcpy
(
above_row
,
above_ref
,
r
);
vpx_memset
(
above_row
+
r
,
above_row
[
r
-
1
],
x0
+
2
*
bs
-
frame_width
);
}
else
{
vpx_memcpy
(
above_row
-
1
,
above_ref
-
1
,
r
+
1
);
vpx_memcpy
(
above_row
,
above_ref
,
r
);
vpx_memset
(
above_row
+
r
,
above_row
[
r
-
1
],
x0
+
2
*
bs
-
frame_width
);
}
above_row
[
-
1
]
=
left_available
?
above_ref
[
-
1
]
:
129
;
}
above_row
[
-
1
]
=
left_available
?
above_ref
[
-
1
]
:
129
;
}
else
{
/* faster path if the block does not need extension */
if
(
bs
==
4
&&
right_available
&&
left_available
)
{
...
...
Write
Preview
Supports
Markdown
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