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
7cf383d1
Commit
7cf383d1
authored
Mar 16, 2015
by
Jingning Han
Browse files
Fix indent in choose_partitioning
Change-Id: I4039f8ac75a9cfcc4d07abd0619d1379bb10fe51
parent
1f9b2b77
Changes
1
Hide whitespace changes
Inline
Side-by-side
vp9/encoder/vp9_encodeframe.c
View file @
7cf383d1
...
...
@@ -658,29 +658,29 @@ static void choose_partitioning(VP9_COMP *cpi,
for
(
k
=
0
;
k
<
4
;
k
++
)
{
int
x8_idx
=
x16_idx
+
((
k
&
1
)
<<
3
);
int
y8_idx
=
y16_idx
+
((
k
>>
1
)
<<
3
);
unsigned
int
sse
=
0
;
int
sum
=
0
;
if
(
x8_idx
<
pixels_wide
&&
y8_idx
<
pixels_high
)
{
int
s_avg
,
d_avg
;
unsigned
int
sse
=
0
;
int
sum
=
0
;
if
(
x8_idx
<
pixels_wide
&&
y8_idx
<
pixels_high
)
{
int
s_avg
,
d_avg
;
#if CONFIG_VP9_HIGHBITDEPTH
if
(
xd
->
cur_buf
->
flags
&
YV12_FLAG_HIGHBITDEPTH
)
{
s_avg
=
vp9_highbd_avg_8x8
(
s
+
y8_idx
*
sp
+
x8_idx
,
sp
);
d_avg
=
vp9_highbd_avg_8x8
(
d
+
y8_idx
*
dp
+
x8_idx
,
dp
);
}
else
{
s_avg
=
vp9_avg_8x8
(
s
+
y8_idx
*
sp
+
x8_idx
,
sp
);
d_avg
=
vp9_avg_8x8
(
d
+
y8_idx
*
dp
+
x8_idx
,
dp
);
}
#else
if
(
xd
->
cur_buf
->
flags
&
YV12_FLAG_HIGHBITDEPTH
)
{
s_avg
=
vp9_highbd_avg_8x8
(
s
+
y8_idx
*
sp
+
x8_idx
,
sp
);
d_avg
=
vp9_highbd_avg_8x8
(
d
+
y8_idx
*
dp
+
x8_idx
,
dp
);
}
else
{
s_avg
=
vp9_avg_8x8
(
s
+
y8_idx
*
sp
+
x8_idx
,
sp
);
d_avg
=
vp9_avg_8x8
(
d
+
y8_idx
*
dp
+
x8_idx
,
dp
);
#endif
sum
=
s_avg
-
d_avg
;
sse
=
sum
*
sum
;
}
// If variance is based on 8x8 downsampling, we stop here and have
// one sample for 8x8 block (so use 1 for count in fill_variance),
// which of course means variance = 0 for 8x8 block.
fill_variance
(
sse
,
sum
,
0
,
&
vst
->
split
[
k
].
part_variances
.
none
);
#else
s_avg
=
vp9_avg_8x8
(
s
+
y8_idx
*
sp
+
x8_idx
,
sp
);
d_avg
=
vp9_avg_8x8
(
d
+
y8_idx
*
dp
+
x8_idx
,
dp
);
#endif
sum
=
s_avg
-
d_avg
;
sse
=
sum
*
sum
;
}
// If variance is based on 8x8 downsampling, we stop here and have
// one sample for 8x8 block (so use 1 for count in fill_variance),
// which of course means variance = 0 for 8x8 block.
fill_variance
(
sse
,
sum
,
0
,
&
vst
->
split
[
k
].
part_variances
.
none
);
}
fill_variance_tree
(
&
vt
.
split
[
i
].
split
[
j
],
BLOCK_16X16
);
// For low-resolution, compute the variance based on 8x8 down-sampling,
...
...
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