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
ef99b7b8
Commit
ef99b7b8
authored
Nov 14, 2013
by
Jim Bankoski
Browse files
loop filter assert cleanout
Change-Id: I4e2ad4b7342681e6ac236356ef3a4927a54f105b
parent
4da2a8b7
Changes
1
Hide whitespace changes
Inline
Side-by-side
vp9/common/vp9_loopfilter.c
View file @
ef99b7b8
...
...
@@ -351,19 +351,12 @@ static void filter_selectively_vert(uint8_t *s, int pitch,
if
(
mask_16x16
&
1
)
{
vp9_mb_lpf_vertical_edge_w
(
s
,
pitch
,
lfi
->
mblim
,
lfi
->
lim
,
lfi
->
hev_thr
);
assert
(
!
(
mask_8x8
&
1
));
assert
(
!
(
mask_4x4
&
1
));
assert
(
!
(
mask_4x4_int
&
1
));
}
else
if
(
mask_8x8
&
1
)
{
vp9_mbloop_filter_vertical_edge
(
s
,
pitch
,
lfi
->
mblim
,
lfi
->
lim
,
lfi
->
hev_thr
,
1
);
assert
(
!
(
mask_16x16
&
1
));
assert
(
!
(
mask_4x4
&
1
));
}
else
if
(
mask_4x4
&
1
)
{
vp9_loop_filter_vertical_edge
(
s
,
pitch
,
lfi
->
mblim
,
lfi
->
lim
,
lfi
->
hev_thr
,
1
);
assert
(
!
(
mask_16x16
&
1
));
assert
(
!
(
mask_8x8
&
1
));
}
}
if
(
mask_4x4_int
&
1
)
...
...
@@ -403,9 +396,6 @@ static void filter_selectively_horiz(uint8_t *s, int pitch,
vp9_mb_lpf_horizontal_edge_w
(
s
,
pitch
,
lfi
->
mblim
,
lfi
->
lim
,
lfi
->
hev_thr
,
1
);
}
assert
(
!
(
mask_8x8
&
1
));
assert
(
!
(
mask_4x4
&
1
));
assert
(
!
(
mask_4x4_int
&
1
));
}
else
if
(
mask_8x8
&
1
)
{
if
((
mask_8x8
&
3
)
==
3
)
{
// Next block's thresholds
...
...
@@ -442,8 +432,6 @@ static void filter_selectively_horiz(uint8_t *s, int pitch,
vp9_loop_filter_horizontal_edge
(
s
+
4
*
pitch
,
pitch
,
lfi
->
mblim
,
lfi
->
lim
,
lfi
->
hev_thr
,
1
);
}
assert
(
!
(
mask_16x16
&
1
));
assert
(
!
(
mask_4x4
&
1
));
}
else
if
(
mask_4x4
&
1
)
{
if
((
mask_4x4
&
3
)
==
3
)
{
// Next block's thresholds
...
...
@@ -480,8 +468,6 @@ static void filter_selectively_horiz(uint8_t *s, int pitch,
vp9_loop_filter_horizontal_edge
(
s
+
4
*
pitch
,
pitch
,
lfi
->
mblim
,
lfi
->
lim
,
lfi
->
hev_thr
,
1
);
}
assert
(
!
(
mask_16x16
&
1
));
assert
(
!
(
mask_8x8
&
1
));
}
else
if
(
mask_4x4_int
&
1
)
{
vp9_loop_filter_horizontal_edge
(
s
+
4
*
pitch
,
pitch
,
lfi
->
mblim
,
lfi
->
lim
,
lfi
->
hev_thr
,
1
);
...
...
@@ -860,6 +846,24 @@ static void setup_mask(VP9_COMMON *const cm, const int mi_row, const int mi_col,
lfm
->
left_uv
[
i
]
&=
0xeeee
;
}
}
// Assert if we try to apply 2 different loop filters at the same position.
assert
(
!
(
lfm
->
left_y
[
TX_16X16
]
&
lfm
->
left_y
[
TX_8X8
]));
assert
(
!
(
lfm
->
left_y
[
TX_16X16
]
&
lfm
->
left_y
[
TX_4X4
]));
assert
(
!
(
lfm
->
left_y
[
TX_8X8
]
&
lfm
->
left_y
[
TX_4X4
]));
assert
(
!
(
lfm
->
int_4x4_y
&
lfm
->
left_y
[
TX_16X16
]));
assert
(
!
(
lfm
->
left_uv
[
TX_16X16
]
&
lfm
->
left_uv
[
TX_8X8
]));
assert
(
!
(
lfm
->
left_uv
[
TX_16X16
]
&
lfm
->
left_uv
[
TX_4X4
]));
assert
(
!
(
lfm
->
left_uv
[
TX_8X8
]
&
lfm
->
left_uv
[
TX_4X4
]));
assert
(
!
(
lfm
->
int_4x4_uv
&
lfm
->
left_uv
[
TX_16X16
]));
assert
(
!
(
lfm
->
above_y
[
TX_16X16
]
&
lfm
->
above_y
[
TX_8X8
]));
assert
(
!
(
lfm
->
above_y
[
TX_16X16
]
&
lfm
->
above_y
[
TX_4X4
]));
assert
(
!
(
lfm
->
above_y
[
TX_8X8
]
&
lfm
->
above_y
[
TX_4X4
]));
assert
(
!
(
lfm
->
int_4x4_y
&
lfm
->
above_y
[
TX_16X16
]));
assert
(
!
(
lfm
->
above_uv
[
TX_16X16
]
&
lfm
->
above_uv
[
TX_8X8
]));
assert
(
!
(
lfm
->
above_uv
[
TX_16X16
]
&
lfm
->
above_uv
[
TX_4X4
]));
assert
(
!
(
lfm
->
above_uv
[
TX_8X8
]
&
lfm
->
above_uv
[
TX_4X4
]));
assert
(
!
(
lfm
->
int_4x4_uv
&
lfm
->
above_uv
[
TX_16X16
]));
}
#if CONFIG_NON420
...
...
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