Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
Xiph.Org
aom-rav1e
Commits
29736b88
Commit
29736b88
authored
Jan 10, 2014
by
Jingning Han
Committed by
Gerrit Code Review
Jan 10, 2014
Browse files
Options
Browse Files
Download
Plain Diff
Merge "Declare setup_buffer_inter in vp9_rdopt.h"
parents
4f969ccc
db2b350d
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
24 additions
and
15 deletions
+24
-15
vp9/encoder/vp9_rdopt.c
vp9/encoder/vp9_rdopt.c
+15
-15
vp9/encoder/vp9_rdopt.h
vp9/encoder/vp9_rdopt.h
+9
-0
No files found.
vp9/encoder/vp9_rdopt.c
View file @
29736b88
...
...
@@ -2276,14 +2276,14 @@ static void setup_pred_block(const MACROBLOCKD *xd,
}
}
static
void
setup_buffer_inter
(
VP9_COMP
*
cpi
,
MACROBLOCK
*
x
,
const
TileInfo
*
const
tile
,
int
idx
,
MV_REFERENCE_FRAME
frame_type
,
BLOCK_SIZE
block_size
,
int
mi_row
,
int
mi_col
,
int_mv
frame_nearest_mv
[
MAX_REF_FRAMES
],
int_mv
frame_near_mv
[
MAX_REF_FRAMES
],
struct
buf_2d
yv12_mb
[
4
][
MAX_MB_PLANE
])
{
void
vp9_
setup_buffer_inter
(
VP9_COMP
*
cpi
,
MACROBLOCK
*
x
,
const
TileInfo
*
const
tile
,
int
idx
,
MV_REFERENCE_FRAME
frame_type
,
BLOCK_SIZE
block_size
,
int
mi_row
,
int
mi_col
,
int_mv
frame_nearest_mv
[
MAX_REF_FRAMES
],
int_mv
frame_near_mv
[
MAX_REF_FRAMES
],
struct
buf_2d
yv12_mb
[
4
][
MAX_MB_PLANE
])
{
VP9_COMMON
*
cm
=
&
cpi
->
common
;
YV12_BUFFER_CONFIG
*
yv12
=
&
cm
->
yv12_fb
[
cpi
->
common
.
ref_frame_map
[
idx
]];
MACROBLOCKD
*
const
xd
=
&
x
->
e_mbd
;
...
...
@@ -3178,9 +3178,9 @@ int64_t vp9_rd_pick_inter_mode_sb(VP9_COMP *cpi, MACROBLOCK *x,
for
(
ref_frame
=
LAST_FRAME
;
ref_frame
<=
ALTREF_FRAME
;
++
ref_frame
)
{
x
->
pred_mv_sad
[
ref_frame
]
=
INT_MAX
;
if
(
cpi
->
ref_frame_flags
&
flag_list
[
ref_frame
])
{
setup_buffer_inter
(
cpi
,
x
,
tile
,
get_ref_frame_idx
(
cpi
,
ref_frame
),
ref_frame
,
block_size
,
mi_row
,
mi_col
,
frame_mv
[
NEARESTMV
],
frame_mv
[
NEARMV
],
yv12_mb
);
vp9_
setup_buffer_inter
(
cpi
,
x
,
tile
,
get_ref_frame_idx
(
cpi
,
ref_frame
),
ref_frame
,
block_size
,
mi_row
,
mi_col
,
frame_mv
[
NEARESTMV
],
frame_mv
[
NEARMV
],
yv12_mb
);
}
frame_mv
[
NEWMV
][
ref_frame
].
as_int
=
INVALID_MV
;
frame_mv
[
ZEROMV
][
ref_frame
].
as_int
=
0
;
...
...
@@ -3803,10 +3803,10 @@ int64_t vp9_rd_pick_inter_mode_sub8x8(VP9_COMP *cpi, MACROBLOCK *x,
for
(
ref_frame
=
LAST_FRAME
;
ref_frame
<=
ALTREF_FRAME
;
ref_frame
++
)
{
if
(
cpi
->
ref_frame_flags
&
flag_list
[
ref_frame
])
{
setup_buffer_inter
(
cpi
,
x
,
tile
,
get_ref_frame_idx
(
cpi
,
ref_frame
),
ref_frame
,
block_size
,
mi_row
,
mi_col
,
frame_mv
[
NEARESTMV
],
frame_mv
[
NEARMV
],
yv12_mb
);
vp9_
setup_buffer_inter
(
cpi
,
x
,
tile
,
get_ref_frame_idx
(
cpi
,
ref_frame
),
ref_frame
,
block_size
,
mi_row
,
mi_col
,
frame_mv
[
NEARESTMV
],
frame_mv
[
NEARMV
],
yv12_mb
);
}
frame_mv
[
NEWMV
][
ref_frame
].
as_int
=
INVALID_MV
;
frame_mv
[
ZEROMV
][
ref_frame
].
as_int
=
0
;
...
...
vp9/encoder/vp9_rdopt.h
View file @
29736b88
...
...
@@ -27,6 +27,15 @@ void vp9_initialize_rd_consts(VP9_COMP *cpi);
void
vp9_initialize_me_consts
(
VP9_COMP
*
cpi
,
int
qindex
);
void
vp9_setup_buffer_inter
(
VP9_COMP
*
cpi
,
MACROBLOCK
*
x
,
const
TileInfo
*
const
tile
,
int
idx
,
MV_REFERENCE_FRAME
frame_type
,
BLOCK_SIZE
block_size
,
int
mi_row
,
int
mi_col
,
int_mv
frame_nearest_mv
[
MAX_REF_FRAMES
],
int_mv
frame_near_mv
[
MAX_REF_FRAMES
],
struct
buf_2d
yv12_mb
[
4
][
MAX_MB_PLANE
]);
void
vp9_rd_pick_intra_mode_sb
(
VP9_COMP
*
cpi
,
MACROBLOCK
*
x
,
int
*
r
,
int64_t
*
d
,
BLOCK_SIZE
bsize
,
PICK_MODE_CONTEXT
*
ctx
,
int64_t
best_rd
);
...
...
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