Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
A
aom-rav1e
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Xiph.Org
aom-rav1e
Commits
ffb17e2c
Commit
ffb17e2c
authored
Nov 15, 2013
by
Jim Bankoski
Committed by
Gerrit Code Review
Nov 15, 2013
Browse files
Options
Browse Files
Download
Plain Diff
Merge "loop filter assert cleanout"
parents
38e6cb8c
ef99b7b8
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
18 additions
and
14 deletions
+18
-14
vp9/common/vp9_loopfilter.c
vp9/common/vp9_loopfilter.c
+18
-14
No files found.
vp9/common/vp9_loopfilter.c
View file @
ffb17e2c
...
...
@@ -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
);
...
...
@@ -864,6 +850,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
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