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
dd1e6b8e
Commit
dd1e6b8e
authored
May 02, 2013
by
Ronald S. Bultje
Committed by
Gerrit Code Review
May 02, 2013
Browse files
Options
Browse Files
Download
Plain Diff
Merge "Fix block reconstruction with sb8x8 enabled." into experimental
parents
a4279138
ff37688a
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
1 deletion
+7
-1
vp9/common/vp9_recon.c
vp9/common/vp9_recon.c
+3
-1
vp9/common/vp9_rtcd_defs.sh
vp9/common/vp9_rtcd_defs.sh
+4
-0
No files found.
vp9/common/vp9_recon.c
View file @
dd1e6b8e
...
...
@@ -31,9 +31,10 @@ static INLINE void recon(int rows, int cols,
void
vp9_recon_b_c
(
uint8_t
*
pred_ptr
,
int16_t
*
diff_ptr
,
uint8_t
*
dst_ptr
,
int
stride
)
{
assert
(
pred_ptr
==
dst_ptr
);
recon
(
4
,
4
,
diff_ptr
,
16
,
dst_ptr
,
stride
);
recon
(
4
,
4
,
diff_ptr
,
16
>>
CONFIG_SB8X8
,
dst_ptr
,
stride
);
}
#if !CONFIG_SB8X8
void
vp9_recon_uv_b_c
(
uint8_t
*
pred_ptr
,
int16_t
*
diff_ptr
,
uint8_t
*
dst_ptr
,
int
stride
)
{
assert
(
pred_ptr
==
dst_ptr
);
...
...
@@ -51,6 +52,7 @@ void vp9_recon2b_c(uint8_t *pred_ptr, int16_t *diff_ptr, uint8_t *dst_ptr,
assert
(
pred_ptr
==
dst_ptr
);
recon
(
4
,
8
,
diff_ptr
,
8
,
dst_ptr
,
stride
);
}
#endif
static
void
recon_plane
(
MACROBLOCKD
*
xd
,
BLOCK_SIZE_TYPE
bsize
,
int
plane
)
{
const
int
bw
=
4
<<
(
b_width_log2
(
bsize
)
-
xd
->
plane
[
plane
].
subsampling_x
);
...
...
vp9/common/vp9_rtcd_defs.sh
View file @
dd1e6b8e
...
...
@@ -63,6 +63,8 @@ specialize vp9_copy_mem8x4 mmx
prototype void vp9_recon_b
"uint8_t *pred_ptr, int16_t *diff_ptr, uint8_t *dst_ptr, int stride"
specialize vp9_recon_b
if
[
"
$CONFIG_SB8X8
"
!=
"yes"
]
;
then
prototype void vp9_recon_uv_b
"uint8_t *pred_ptr, int16_t *diff_ptr, uint8_t *dst_ptr, int stride"
specialize vp9_recon_uv_b
...
...
@@ -76,6 +78,8 @@ prototype void vp9_recon4b "uint8_t *pred_ptr, int16_t *diff_ptr, uint8_t *dst_p
specialize vp9_recon4b
# specialize vp9_recon4b sse2
fi
prototype void vp9_recon_sb
"struct macroblockd *x, enum BLOCK_SIZE_TYPE bsize"
specialize vp9_recon_sb
...
...
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