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
1aa6cbc7
Commit
1aa6cbc7
authored
Oct 11, 2016
by
Yaowu Xu
Committed by
Gerrit Code Review
Oct 11, 2016
Browse files
Merge "Bugfix in the CLPF RDO." into nextgenv2
parents
4082ff0b
2e40cc4c
Changes
3
Hide whitespace changes
Inline
Side-by-side
av1/common/clpf.c
View file @
1aa6cbc7
...
...
@@ -108,12 +108,9 @@ int av1_clpf_frame(const YV12_BUFFER_CONFIG *frame,
:
frame
->
y_buffer
;
uint8_t
*
dst_buffer
;
// Make buffer space for in-place filtering
#if CONFIG_AOM_HIGHBITDEPTH
strength
<<=
(
cm
->
bit_depth
-
8
);
#endif
// Make buffer space for in-place filtering
#if CONFIG_AOM_HIGHBITDEPTH
CHECK_MEM_ERROR
(
cm
,
cache
,
aom_malloc
(
cache_size
<<
!!
cm
->
use_highbitdepth
));
dst_buffer
=
cm
->
use_highbitdepth
?
CONVERT_TO_BYTEPTR
(
cache
)
:
cache
;
#else
...
...
av1/encoder/clpf_rdo.c
View file @
1aa6cbc7
...
...
@@ -332,6 +332,6 @@ void av1_clpf_test_frame(const YV12_BUFFER_CONFIG *rec,
for
(
j
=
0
;
j
<
4
;
j
++
)
if
((
!
c
||
j
)
&&
sums
[
c
][
j
]
<
best
)
best
=
sums
[
c
][
j
];
best
&=
15
;
*
best_bs
=
(
best
>
3
)
*
(
5
+
(
best
<
12
)
+
(
best
<
8
));
if
(
best_bs
)
*
best_bs
=
(
best
>
3
)
*
(
5
+
(
best
<
12
)
+
(
best
<
8
));
*
best_strength
=
best
?
1
<<
((
best
-
1
)
&
3
)
:
0
;
}
av1/encoder/encoder.c
View file @
1aa6cbc7
...
...
@@ -3438,10 +3438,8 @@ static void loopfilter_frame(AV1_COMP *cpi, AV1_COMMON *cm) {
int
fb_size_log2
,
strength_y
,
strength_u
,
strength_v
;
av1_clpf_test_frame
(
frame
,
cpi
->
Source
,
cm
,
&
strength_y
,
&
fb_size_log2
,
AOM_PLANE_Y
);
av1_clpf_test_frame
(
frame
,
cpi
->
Source
,
cm
,
&
strength_u
,
&
fb_size_log2
,
AOM_PLANE_U
);
av1_clpf_test_frame
(
frame
,
cpi
->
Source
,
cm
,
&
strength_v
,
&
fb_size_log2
,
AOM_PLANE_V
);
av1_clpf_test_frame
(
frame
,
cpi
->
Source
,
cm
,
&
strength_u
,
0
,
AOM_PLANE_U
);
av1_clpf_test_frame
(
frame
,
cpi
->
Source
,
cm
,
&
strength_v
,
0
,
AOM_PLANE_V
);
if
(
!
fb_size_log2
)
fb_size_log2
=
get_msb
(
MAX_FB_SIZE
);
...
...
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