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
ac7bab75
Commit
ac7bab75
authored
Jul 31, 2013
by
Jingning Han
Committed by
Gerrit Code Review
Jul 31, 2013
Browse files
Merge "Make the use of ref_frame index consistent"
parents
18cb8bdd
86c384d3
Changes
1
Hide whitespace changes
Inline
Side-by-side
vp9/encoder/vp9_encodeframe.c
View file @
ac7bab75
...
...
@@ -1088,7 +1088,8 @@ static void choose_partitioning(VP9_COMP *cpi, MODE_INFO *m, int mi_row,
dp
=
64
;
if
(
cm
->
frame_type
!=
KEY_FRAME
)
{
int_mv
nearest_mv
,
near_mv
;
YV12_BUFFER_CONFIG
*
ref_fb
=
&
cm
->
yv12_fb
[
0
];
const
int
idx
=
cm
->
ref_frame_map
[
get_ref_frame_idx
(
cpi
,
LAST_FRAME
)];
YV12_BUFFER_CONFIG
*
ref_fb
=
&
cm
->
yv12_fb
[
idx
];
YV12_BUFFER_CONFIG
*
second_ref_fb
=
NULL
;
setup_pre_planes
(
xd
,
0
,
ref_fb
,
mi_row
,
mi_col
,
...
...
@@ -1104,7 +1105,6 @@ static void choose_partitioning(VP9_COMP *cpi, MODE_INFO *m, int mi_row,
vp9_build_inter_predictors_sby
(
xd
,
mi_row
,
mi_col
,
BLOCK_SIZE_SB64X64
);
d
=
xd
->
plane
[
0
].
dst
.
buf
;
dp
=
xd
->
plane
[
0
].
dst
.
stride
;
}
// Fill in the entire tree of 8x8 variances for splits.
...
...
@@ -1166,6 +1166,7 @@ static void choose_partitioning(VP9_COMP *cpi, MODE_INFO *m, int mi_row,
}
}
}
static
void
rd_use_partition
(
VP9_COMP
*
cpi
,
MODE_INFO
*
m
,
TOKENEXTRA
**
tp
,
int
mi_row
,
int
mi_col
,
BLOCK_SIZE_TYPE
bsize
,
int
*
rate
,
int64_t
*
dist
,
int
do_recon
)
{
...
...
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