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
Guillaume Martres
aom-rav1e
Commits
5b04962c
Commit
5b04962c
authored
Jan 03, 2014
by
Dmitry Kovalev
Browse files
Merging best_ref_mv and second_best_ref_mv into best_ref_mv[2].
Change-Id: If04b57828847cee09a79c94e1098d1aa4990ea0d
parent
f16b186b
Changes
3
Hide whitespace changes
Inline
Side-by-side
vp9/encoder/vp9_block.h
View file @
5b04962c
...
...
@@ -41,8 +41,7 @@ typedef struct {
int
is_coded
;
int
num_4x4_blk
;
int
skip
;
int_mv
best_ref_mv
;
int_mv
second_best_ref_mv
;
int_mv
best_ref_mv
[
2
];
int_mv
ref_mvs
[
MAX_REF_FRAMES
][
MAX_MV_REF_CANDIDATES
];
int
rate
;
int
distortion
;
...
...
vp9/encoder/vp9_encodeframe.c
View file @
5b04962c
...
...
@@ -513,8 +513,8 @@ static void update_state(VP9_COMP *cpi, PICK_MODE_CONTEXT *ctx,
int_mv
best_mv
[
2
];
const
MV_REFERENCE_FRAME
rf1
=
mbmi
->
ref_frame
[
0
];
const
MV_REFERENCE_FRAME
rf2
=
mbmi
->
ref_frame
[
1
];
best_mv
[
0
].
as_int
=
ctx
->
best_ref_mv
.
as_int
;
best_mv
[
1
].
as_int
=
ctx
->
second_
best_ref_mv
.
as_int
;
best_mv
[
0
].
as_int
=
ctx
->
best_ref_mv
[
0
]
.
as_int
;
best_mv
[
1
].
as_int
=
ctx
->
best_ref_mv
[
1
]
.
as_int
;
if
(
mbmi
->
mode
==
NEWMV
)
{
best_mv
[
0
].
as_int
=
mbmi
->
ref_mvs
[
rf1
][
0
].
as_int
;
if
(
rf2
>
0
)
...
...
vp9/encoder/vp9_rdopt.c
View file @
5b04962c
...
...
@@ -2217,8 +2217,8 @@ static void store_coding_context(MACROBLOCK *x, PICK_MODE_CONTEXT *ctx,
ctx
->
best_mode_index
=
mode_index
;
ctx
->
mic
=
*
xd
->
mi_8x8
[
0
];
ctx
->
best_ref_mv
.
as_int
=
ref_mv
->
as_int
;
ctx
->
second_
best_ref_mv
.
as_int
=
second_ref_mv
->
as_int
;
ctx
->
best_ref_mv
[
0
]
.
as_int
=
ref_mv
->
as_int
;
ctx
->
best_ref_mv
[
1
]
.
as_int
=
second_ref_mv
->
as_int
;
ctx
->
single_pred_diff
=
(
int
)
comp_pred_diff
[
SINGLE_REFERENCE
];
ctx
->
comp_pred_diff
=
(
int
)
comp_pred_diff
[
COMPOUND_REFERENCE
];
...
...
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