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
2fd70ee1
Commit
2fd70ee1
authored
Sep 02, 2016
by
Steinar Midtskogen
Committed by
Yaowu Xu
Oct 10, 2016
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Silence some harmless compiler warnings in CLPF.
Change-Id: I4a6d84007bc17b89cfd8d8f2440bf2968505bd6a
parent
be668e92
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
16 additions
and
14 deletions
+16
-14
av1/common/clpf.c
av1/common/clpf.c
+0
-1
av1/decoder/decodeframe.c
av1/decoder/decodeframe.c
+7
-4
av1/encoder/clpf_rdo.c
av1/encoder/clpf_rdo.c
+9
-9
No files found.
av1/common/clpf.c
View file @
2fd70ee1
...
...
@@ -63,7 +63,6 @@ int av1_clpf_frame(const YV12_BUFFER_CONFIG *dst, const YV12_BUFFER_CONFIG *rec,
int
height
=
rec
->
y_crop_height
;
int
xpos
,
ypos
;
int
stride_y
=
rec
->
y_stride
;
int
stride_c
=
rec
->
uv_stride
;
const
int
bs
=
MAX_MIB_SIZE
;
int
num_fb_hor
=
(
width
+
(
1
<<
fb_size_log2
)
-
bs
)
>>
fb_size_log2
;
int
num_fb_ver
=
(
height
+
(
1
<<
fb_size_log2
)
-
bs
)
>>
fb_size_log2
;
...
...
av1/decoder/decodeframe.c
View file @
2fd70ee1
...
...
@@ -17,6 +17,7 @@
#include "./aom_scale_rtcd.h"
#include "./av1_rtcd.h"
#include "aom/aom_codec.h"
#include "aom_dsp/aom_dsp_common.h"
#include "aom_dsp/bitreader.h"
#include "aom_dsp/bitreader_buffer.h"
...
...
@@ -2059,10 +2060,12 @@ static void setup_clpf(AV1_COMMON *cm, struct aom_read_bit_buffer *rb) {
}
}
static
int
clpf_bit
(
int
k
,
int
l
,
const
YV12_BUFFER_CONFIG
*
rec
,
const
YV12_BUFFER_CONFIG
*
org
,
const
AV1_COMMON
*
cm
,
int
block_size
,
int
w
,
int
h
,
unsigned
int
strength
,
unsigned
int
fb_size_log2
,
uint8_t
*
bit
)
{
static
int
clpf_bit
(
UNUSED
int
k
,
UNUSED
int
l
,
UNUSED
const
YV12_BUFFER_CONFIG
*
rec
,
UNUSED
const
YV12_BUFFER_CONFIG
*
org
,
UNUSED
const
AV1_COMMON
*
cm
,
UNUSED
int
block_size
,
UNUSED
int
w
,
UNUSED
int
h
,
UNUSED
unsigned
int
strength
,
UNUSED
unsigned
int
fb_size_log2
,
uint8_t
*
bit
)
{
return
*
bit
;
}
#endif
...
...
av1/encoder/clpf_rdo.c
View file @
2fd70ee1
...
...
@@ -100,7 +100,7 @@ static int clpf_rdo(int y, int x, const YV12_BUFFER_CONFIG *rec,
const
YV12_BUFFER_CONFIG
*
org
,
const
AV1_COMMON
*
cm
,
unsigned
int
block_size
,
unsigned
int
fb_size_log2
,
int
w
,
int
h
,
int64_t
res
[
4
][
4
])
{
int
i
,
m
,
n
,
filtered
=
0
;
int
c
,
m
,
n
,
filtered
=
0
;
int
sum
[
4
];
int
bslog
=
get_msb
(
block_size
);
sum
[
0
]
=
sum
[
1
]
=
sum
[
2
]
=
sum
[
3
]
=
0
;
...
...
@@ -153,11 +153,11 @@ static int clpf_rdo(int y, int x, const YV12_BUFFER_CONFIG *rec,
}
}
for
(
i
=
0
;
i
<
4
;
i
++
)
{
res
[
i
][
0
]
+=
sum
[
0
];
res
[
i
][
1
]
+=
sum
[
1
];
res
[
i
][
2
]
+=
sum
[
2
];
res
[
i
][
3
]
+=
sum
[
3
];
for
(
c
=
0
;
c
<
4
;
c
++
)
{
res
[
c
][
0
]
+=
sum
[
0
];
res
[
c
][
1
]
+=
sum
[
1
];
res
[
c
][
2
]
+=
sum
[
2
];
res
[
c
][
3
]
+=
sum
[
3
];
}
return
filtered
;
}
...
...
@@ -165,7 +165,7 @@ static int clpf_rdo(int y, int x, const YV12_BUFFER_CONFIG *rec,
void
av1_clpf_test_frame
(
const
YV12_BUFFER_CONFIG
*
rec
,
const
YV12_BUFFER_CONFIG
*
org
,
const
AV1_COMMON
*
cm
,
int
*
best_strength
,
int
*
best_bs
)
{
int
i
,
j
,
k
,
l
;
int
c
,
j
,
k
,
l
;
int64_t
best
,
sums
[
4
][
4
];
int
width
=
rec
->
y_crop_width
,
height
=
rec
->
y_crop_height
;
const
int
bs
=
MAX_MIB_SIZE
;
...
...
@@ -213,9 +213,9 @@ void av1_clpf_test_frame(const YV12_BUFFER_CONFIG *rec,
}
best
=
(
int64_t
)
1
<<
62
;
for
(
i
=
0
;
i
<
4
;
i
++
)
for
(
c
=
0
;
c
<
4
;
c
++
)
for
(
j
=
0
;
j
<
4
;
j
++
)
if
((
!
i
||
j
)
&&
sums
[
i
][
j
]
<
best
)
best
=
sums
[
i
][
j
];
if
((
!
c
||
j
)
&&
sums
[
c
][
j
]
<
best
)
best
=
sums
[
c
][
j
];
best
&=
15
;
*
best_bs
=
(
best
>
3
)
*
(
5
+
(
best
<
12
)
+
(
best
<
8
));
*
best_strength
=
best
?
1
<<
((
best
-
1
)
&
3
)
:
0
;
...
...
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