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
761a7088
Commit
761a7088
authored
Jan 20, 2016
by
Yaowu Xu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
VP9_INTERP_EXTEND -> VPX_INTERP_EXTEND
Change-Id: I375d565b9c90a40799b3fb6f968ac6e4b4d4f093
parent
75b57d39
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
23 additions
and
23 deletions
+23
-23
vp10/common/reconinter.h
vp10/common/reconinter.h
+2
-2
vp10/decoder/decodeframe.c
vp10/decoder/decodeframe.c
+4
-4
vp10/encoder/encodeframe.c
vp10/encoder/encodeframe.c
+4
-4
vp10/encoder/mcomp.h
vp10/encoder/mcomp.h
+1
-1
vp10/encoder/rdopt.c
vp10/encoder/rdopt.c
+2
-2
vp10/encoder/temporal_filter.c
vp10/encoder/temporal_filter.c
+9
-9
vpx_scale/yv12config.h
vpx_scale/yv12config.h
+1
-1
No files found.
vp10/common/reconinter.h
View file @
761a7088
...
...
@@ -83,9 +83,9 @@ static INLINE MV clamp_mv_to_umv_border_sb(const MACROBLOCKD *xd,
// If the MV points so far into the UMV border that no visible pixels
// are used for reconstruction, the subpel part of the MV can be
// discarded and the MV limited to 16 pixels with equivalent results.
const
int
spel_left
=
(
VP
9
_INTERP_EXTEND
+
bw
)
<<
SUBPEL_BITS
;
const
int
spel_left
=
(
VP
X
_INTERP_EXTEND
+
bw
)
<<
SUBPEL_BITS
;
const
int
spel_right
=
spel_left
-
SUBPEL_SHIFTS
;
const
int
spel_top
=
(
VP
9
_INTERP_EXTEND
+
bh
)
<<
SUBPEL_BITS
;
const
int
spel_top
=
(
VP
X
_INTERP_EXTEND
+
bh
)
<<
SUBPEL_BITS
;
const
int
spel_bottom
=
spel_top
-
SUBPEL_SHIFTS
;
MV
clamped_mv
=
{
src_mv
->
row
*
(
1
<<
(
1
-
ss_y
)),
...
...
vp10/decoder/decodeframe.c
View file @
761a7088
...
...
@@ -632,14 +632,14 @@ static void dec_build_inter_predictors(VP10Decoder *const pbi, MACROBLOCKD *xd,
int
x_pad
=
0
,
y_pad
=
0
;
if
(
subpel_x
||
(
sf
->
x_step_q4
!=
SUBPEL_SHIFTS
))
{
x0
-=
VP
9
_INTERP_EXTEND
-
1
;
x1
+=
VP
9
_INTERP_EXTEND
;
x0
-=
VP
X
_INTERP_EXTEND
-
1
;
x1
+=
VP
X
_INTERP_EXTEND
;
x_pad
=
1
;
}
if
(
subpel_y
||
(
sf
->
y_step_q4
!=
SUBPEL_SHIFTS
))
{
y0
-=
VP
9
_INTERP_EXTEND
-
1
;
y1
+=
VP
9
_INTERP_EXTEND
;
y0
-=
VP
X
_INTERP_EXTEND
-
1
;
y1
+=
VP
X
_INTERP_EXTEND
;
y_pad
=
1
;
}
...
...
vp10/encoder/encodeframe.c
View file @
761a7088
...
...
@@ -203,10 +203,10 @@ static void set_offsets(VP10_COMP *cpi, const TileInfo *const tile,
// Set up limit values for MV components.
// Mv beyond the range do not produce new/different prediction block.
x
->
mv_row_min
=
-
(((
mi_row
+
mi_height
)
*
MI_SIZE
)
+
VP
9
_INTERP_EXTEND
);
x
->
mv_col_min
=
-
(((
mi_col
+
mi_width
)
*
MI_SIZE
)
+
VP
9
_INTERP_EXTEND
);
x
->
mv_row_max
=
(
cm
->
mi_rows
-
mi_row
)
*
MI_SIZE
+
VP
9
_INTERP_EXTEND
;
x
->
mv_col_max
=
(
cm
->
mi_cols
-
mi_col
)
*
MI_SIZE
+
VP
9
_INTERP_EXTEND
;
x
->
mv_row_min
=
-
(((
mi_row
+
mi_height
)
*
MI_SIZE
)
+
VP
X
_INTERP_EXTEND
);
x
->
mv_col_min
=
-
(((
mi_col
+
mi_width
)
*
MI_SIZE
)
+
VP
X
_INTERP_EXTEND
);
x
->
mv_row_max
=
(
cm
->
mi_rows
-
mi_row
)
*
MI_SIZE
+
VP
X
_INTERP_EXTEND
;
x
->
mv_col_max
=
(
cm
->
mi_cols
-
mi_col
)
*
MI_SIZE
+
VP
X
_INTERP_EXTEND
;
// Set up distance of MB to edge of frame in 1/8th pel units.
assert
(
!
(
mi_col
&
(
mi_width
-
1
))
&&
!
(
mi_row
&
(
mi_height
-
1
)));
...
...
vp10/encoder/mcomp.h
View file @
761a7088
...
...
@@ -29,7 +29,7 @@ extern "C" {
#define MAX_FIRST_STEP (1 << (MAX_MVSEARCH_STEPS-1))
// Allowed motion vector pixel distance outside image border
// for Block_16x16
#define BORDER_MV_PIXELS_B16 (16 + VP
9
_INTERP_EXTEND)
#define BORDER_MV_PIXELS_B16 (16 + VP
X
_INTERP_EXTEND)
// motion search site
typedef
struct
search_site
{
...
...
vp10/encoder/rdopt.c
View file @
761a7088
...
...
@@ -2405,9 +2405,9 @@ static int discount_newmv_test(const VP10_COMP *cpi,
(
mode_mv
[
NEARMV
][
ref_frame
].
as_int
==
INVALID_MV
)));
}
#define LEFT_TOP_MARGIN ((VP9_ENC_BORDER_IN_PIXELS - VP
9
_INTERP_EXTEND) << 3)
#define LEFT_TOP_MARGIN ((VP9_ENC_BORDER_IN_PIXELS - VP
X
_INTERP_EXTEND) << 3)
#define RIGHT_BOTTOM_MARGIN ((VP9_ENC_BORDER_IN_PIXELS -\
VP
9
_INTERP_EXTEND) << 3)
VP
X
_INTERP_EXTEND) << 3)
// TODO(jingning): this mv clamping function should be block size dependent.
static
INLINE
void
clamp_mv2
(
MV
*
mv
,
const
MACROBLOCKD
*
xd
)
{
...
...
vp10/encoder/temporal_filter.c
View file @
761a7088
...
...
@@ -316,16 +316,16 @@ static void temporal_filter_iterate_c(VP10_COMP *cpi,
// L/A/G reference frames that have a border of 32 (VP9ENCBORDERINPIXELS)
// A 6/8 tap filter is used for motion search. This requires 2 pixels
// before and 3 pixels after. So the largest Y mv on a border would
// then be 16 - VP
9
_INTERP_EXTEND. The UV blocks are half the size of the
// then be 16 - VP
X
_INTERP_EXTEND. The UV blocks are half the size of the
// Y and therefore only extended by 8. The largest mv that a UV block
// can support is 8 - VP
9
_INTERP_EXTEND. A UV mv is half of a Y mv.
// (16 - VP
9
_INTERP_EXTEND) >> 1 which is greater than
// 8 - VP
9
_INTERP_EXTEND.
// can support is 8 - VP
X
_INTERP_EXTEND. A UV mv is half of a Y mv.
// (16 - VP
X
_INTERP_EXTEND) >> 1 which is greater than
// 8 - VP
X
_INTERP_EXTEND.
// To keep the mv in play for both Y and UV planes the max that it
// can be on a border is therefore 16 - (2*VP
9
_INTERP_EXTEND+1).
cpi
->
td
.
mb
.
mv_row_min
=
-
((
mb_row
*
16
)
+
(
17
-
2
*
VP
9
_INTERP_EXTEND
));
// can be on a border is therefore 16 - (2*VP
X
_INTERP_EXTEND+1).
cpi
->
td
.
mb
.
mv_row_min
=
-
((
mb_row
*
16
)
+
(
17
-
2
*
VP
X
_INTERP_EXTEND
));
cpi
->
td
.
mb
.
mv_row_max
=
((
mb_rows
-
1
-
mb_row
)
*
16
)
+
(
17
-
2
*
VP
9
_INTERP_EXTEND
);
+
(
17
-
2
*
VP
X
_INTERP_EXTEND
);
for
(
mb_col
=
0
;
mb_col
<
mb_cols
;
mb_col
++
)
{
int
i
,
j
,
k
;
...
...
@@ -334,9 +334,9 @@ static void temporal_filter_iterate_c(VP10_COMP *cpi,
memset
(
accumulator
,
0
,
16
*
16
*
3
*
sizeof
(
accumulator
[
0
]));
memset
(
count
,
0
,
16
*
16
*
3
*
sizeof
(
count
[
0
]));
cpi
->
td
.
mb
.
mv_col_min
=
-
((
mb_col
*
16
)
+
(
17
-
2
*
VP
9
_INTERP_EXTEND
));
cpi
->
td
.
mb
.
mv_col_min
=
-
((
mb_col
*
16
)
+
(
17
-
2
*
VP
X
_INTERP_EXTEND
));
cpi
->
td
.
mb
.
mv_col_max
=
((
mb_cols
-
1
-
mb_col
)
*
16
)
+
(
17
-
2
*
VP
9
_INTERP_EXTEND
);
+
(
17
-
2
*
VP
X
_INTERP_EXTEND
);
for
(
frame
=
0
;
frame
<
frame_count
;
frame
++
)
{
const
int
thresh_low
=
10000
;
...
...
vpx_scale/yv12config.h
View file @
761a7088
...
...
@@ -22,7 +22,7 @@ extern "C" {
#define VP8BORDERINPIXELS 32
#define VP9INNERBORDERINPIXELS 96
#define VP
9
_INTERP_EXTEND 4
#define VP
X
_INTERP_EXTEND 4
#define VP9_ENC_BORDER_IN_PIXELS 160
#define VP9_DEC_BORDER_IN_PIXELS 32
...
...
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