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
dd04ff50
Commit
dd04ff50
authored
Nov 19, 2013
by
Yaowu Xu
Committed by
Gerrit Code Review
Nov 19, 2013
Browse files
Merge "Move vp9_setup_interp_filter() to encoder"
parents
a944deae
df78fea1
Changes
4
Hide whitespace changes
Inline
Side-by-side
vp9/common/vp9_reconinter.c
View file @
dd04ff50
...
...
@@ -20,25 +20,6 @@
#include
"vp9/common/vp9_reconinter.h"
#include
"vp9/common/vp9_reconintra.h"
void
vp9_setup_interp_filters
(
MACROBLOCKD
*
xd
,
INTERPOLATION_TYPE
mcomp_filter_type
,
VP9_COMMON
*
cm
)
{
if
(
xd
->
mi_8x8
&&
xd
->
mi_8x8
[
0
])
{
MB_MODE_INFO
*
const
mbmi
=
&
xd
->
mi_8x8
[
0
]
->
mbmi
;
set_scale_factors
(
xd
,
mbmi
->
ref_frame
[
0
]
-
LAST_FRAME
,
mbmi
->
ref_frame
[
1
]
-
LAST_FRAME
,
cm
->
active_ref_scale
);
}
else
{
set_scale_factors
(
xd
,
-
1
,
-
1
,
cm
->
active_ref_scale
);
}
xd
->
subpix
.
filter_x
=
xd
->
subpix
.
filter_y
=
vp9_get_filter_kernel
(
mcomp_filter_type
==
SWITCHABLE
?
EIGHTTAP
:
mcomp_filter_type
);
assert
(((
intptr_t
)
xd
->
subpix
.
filter_x
&
0xff
)
==
0
);
}
static
void
inter_predictor
(
const
uint8_t
*
src
,
int
src_stride
,
uint8_t
*
dst
,
int
dst_stride
,
...
...
vp9/common/vp9_reconinter.h
View file @
dd04ff50
...
...
@@ -24,10 +24,6 @@ void vp9_build_inter_predictors_sbuv(MACROBLOCKD *xd, int mi_row, int mi_col,
void
vp9_build_inter_predictors_sb
(
MACROBLOCKD
*
xd
,
int
mi_row
,
int
mi_col
,
BLOCK_SIZE
bsize
);
void
vp9_setup_interp_filters
(
MACROBLOCKD
*
xd
,
INTERPOLATION_TYPE
filter
,
VP9_COMMON
*
cm
);
void
vp9_build_inter_predictor
(
const
uint8_t
*
src
,
int
src_stride
,
uint8_t
*
dst
,
int
dst_stride
,
const
MV
*
mv_q3
,
...
...
vp9/encoder/vp9_encodemb.c
View file @
dd04ff50
...
...
@@ -25,6 +25,26 @@
#include
"vp9/encoder/vp9_rdopt.h"
#include
"vp9/encoder/vp9_tokenize.h"
void
vp9_setup_interp_filters
(
MACROBLOCKD
*
xd
,
INTERPOLATION_TYPE
mcomp_filter_type
,
VP9_COMMON
*
cm
)
{
if
(
xd
->
mi_8x8
&&
xd
->
mi_8x8
[
0
])
{
MB_MODE_INFO
*
const
mbmi
=
&
xd
->
mi_8x8
[
0
]
->
mbmi
;
set_scale_factors
(
xd
,
mbmi
->
ref_frame
[
0
]
-
LAST_FRAME
,
mbmi
->
ref_frame
[
1
]
-
LAST_FRAME
,
cm
->
active_ref_scale
);
}
else
{
set_scale_factors
(
xd
,
-
1
,
-
1
,
cm
->
active_ref_scale
);
}
xd
->
subpix
.
filter_x
=
xd
->
subpix
.
filter_y
=
vp9_get_filter_kernel
(
mcomp_filter_type
==
SWITCHABLE
?
EIGHTTAP
:
mcomp_filter_type
);
assert
(((
intptr_t
)
xd
->
subpix
.
filter_x
&
0xff
)
==
0
);
}
void
vp9_subtract_block_c
(
int
rows
,
int
cols
,
int16_t
*
diff_ptr
,
ptrdiff_t
diff_stride
,
const
uint8_t
*
src_ptr
,
ptrdiff_t
src_stride
,
...
...
vp9/encoder/vp9_encodemb.h
View file @
dd04ff50
...
...
@@ -54,5 +54,7 @@ void vp9_encode_intra_block_y(MACROBLOCK *x, BLOCK_SIZE bsize);
void
vp9_encode_intra_block_uv
(
MACROBLOCK
*
x
,
BLOCK_SIZE
bsize
);
int
vp9_encode_intra
(
MACROBLOCK
*
x
,
int
use_16x16_pred
);
void
vp9_setup_interp_filters
(
MACROBLOCKD
*
xd
,
INTERPOLATION_TYPE
mcomp_filter_type
,
VP9_COMMON
*
cm
);
#endif // VP9_ENCODER_VP9_ENCODEMB_H_
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