Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
Xiph.Org
aom-rav1e
Commits
60a055bd
Commit
60a055bd
authored
Jan 18, 2017
by
David Barker
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix compile errors with loop-restoration + highbd
Change-Id: I0d9850e082b8da3b182a3bbaf6569c45317c9659
parent
9f45bc48
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
4 deletions
+7
-4
av1/common/restoration.c
av1/common/restoration.c
+1
-1
av1/encoder/pickrst.c
av1/encoder/pickrst.c
+6
-3
No files found.
av1/common/restoration.c
View file @
60a055bd
...
...
@@ -1191,7 +1191,7 @@ static void apply_domaintxfmrf_ver_highbd(int iter, int param, uint16_t *img,
int32_t
*
dat
,
int
dat_stride
,
int
bd
)
{
const
int
shift
=
(
bd
-
8
);
int
i
,
j
,
old_px
;
int
i
,
j
,
acc
,
old_px
;
for
(
j
=
0
;
j
<
width
;
++
j
)
{
// top to bottom
acc
=
dat
[
j
];
...
...
av1/encoder/pickrst.c
View file @
60a055bd
...
...
@@ -78,7 +78,8 @@ static int64_t sse_restoration_tile(const YV12_BUFFER_CONFIG *src,
return
filt_err
;
}
static
int64_t
sse_restoration_frame
(
const
YV12_BUFFER_CONFIG
*
src
,
static
int64_t
sse_restoration_frame
(
AV1_COMMON
*
const
cm
,
const
YV12_BUFFER_CONFIG
*
src
,
const
YV12_BUFFER_CONFIG
*
dst
,
int
components_pattern
)
{
int64_t
filt_err
=
0
;
...
...
@@ -95,6 +96,8 @@ static int64_t sse_restoration_frame(const YV12_BUFFER_CONFIG *src,
}
return
filt_err
;
}
#else
(
void
)
cm
;
#endif // CONFIG_AOM_HIGHBITDEPTH
if
((
components_pattern
>>
AOM_PLANE_Y
)
&
1
)
{
filt_err
=
aom_get_y_sse
(
src
,
dst
);
...
...
@@ -154,7 +157,7 @@ static int64_t try_restoration_frame(const YV12_BUFFER_CONFIG *src,
int64_t
filt_err
;
av1_loop_restoration_frame
(
cm
->
frame_to_show
,
cm
,
rsi
,
components_pattern
,
partial_frame
,
dst_frame
);
filt_err
=
sse_restoration_frame
(
src
,
dst_frame
,
components_pattern
);
filt_err
=
sse_restoration_frame
(
cm
,
src
,
dst_frame
,
components_pattern
);
return
filt_err
;
}
...
...
@@ -987,7 +990,7 @@ static double search_wiener_uv(const YV12_BUFFER_CONFIG *src, AV1_COMP *cpi,
aom_yv12_copy_v
(
cm
->
frame_to_show
,
&
cpi
->
last_frame_db
);
rsi
[
plane
].
frame_restoration_type
=
RESTORE_NONE
;
err
=
sse_restoration_frame
(
src
,
cm
->
frame_to_show
,
(
1
<<
plane
));
err
=
sse_restoration_frame
(
cm
,
src
,
cm
->
frame_to_show
,
(
1
<<
plane
));
bits
=
0
;
cost_norestore_frame
=
RDCOST_DBL
(
x
->
rdmult
,
x
->
rddiv
,
(
bits
>>
4
),
err
);
...
...
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