Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
Xiph.Org
aom-rav1e
Commits
f5bbbfad
Commit
f5bbbfad
authored
Sep 26, 2016
by
Yaowu Xu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
rename pred_mv_s8 to pred_mv
Change-Id: Ib1088c3fc80952074e098385fe5eb81742e7dc59
parent
d9470c20
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
18 additions
and
18 deletions
+18
-18
av1/common/blockd.h
av1/common/blockd.h
+1
-1
av1/common/mvref_common.h
av1/common/mvref_common.h
+1
-1
av1/decoder/decodemv.c
av1/decoder/decodemv.c
+3
-3
av1/encoder/bitstream.c
av1/encoder/bitstream.c
+1
-1
av1/encoder/encodemv.c
av1/encoder/encodemv.c
+1
-1
av1/encoder/rdopt.c
av1/encoder/rdopt.c
+11
-11
No files found.
av1/common/blockd.h
View file @
f5bbbfad
...
...
@@ -146,7 +146,7 @@ typedef struct {
PREDICTION_MODE
as_mode
;
int_mv
as_mv
[
2
];
// first, second inter predictor motion vectors
#if CONFIG_REF_MV
int_mv
pred_mv
_s8
[
2
];
int_mv
pred_mv
[
2
];
#endif
#if CONFIG_EXT_INTER
int_mv
ref_mv
[
2
];
...
...
av1/common/mvref_common.h
View file @
f5bbbfad
...
...
@@ -282,7 +282,7 @@ static INLINE int_mv get_sub_block_pred_mv(const MODE_INFO *candidate,
return
block_idx
>=
0
&&
candidate
->
mbmi
.
sb_type
<
BLOCK_8X8
?
candidate
->
bmi
[
idx_n_column_to_subblock
[
block_idx
][
search_col
==
0
]]
.
pred_mv
_s8
[
which_mv
]
.
pred_mv
[
which_mv
]
:
candidate
->
mbmi
.
pred_mv
[
which_mv
];
}
#endif
...
...
av1/decoder/decodemv.c
View file @
f5bbbfad
...
...
@@ -951,7 +951,7 @@ static INLINE int assign_mv(AV1_COMMON *cm, MACROBLOCKD *xd,
MB_MODE_INFO
*
mbmi
=
&
xd
->
mi
[
0
]
->
mbmi
;
BLOCK_SIZE
bsize
=
mbmi
->
sb_type
;
int_mv
*
pred_mv
=
(
bsize
>=
BLOCK_8X8
)
?
mbmi
->
pred_mv
:
xd
->
mi
[
0
]
->
bmi
[
block
].
pred_mv
_s8
;
(
bsize
>=
BLOCK_8X8
)
?
mbmi
->
pred_mv
:
xd
->
mi
[
0
]
->
bmi
[
block
].
pred_mv
;
#endif
(
void
)
ref_frame
;
...
...
@@ -1462,8 +1462,8 @@ static void read_inter_block_mode_info(AV1Decoder *const pbi,
}
#if CONFIG_REF_MV
mbmi
->
pred_mv
[
0
].
as_int
=
mi
->
bmi
[
3
].
pred_mv
_s8
[
0
].
as_int
;
mbmi
->
pred_mv
[
1
].
as_int
=
mi
->
bmi
[
3
].
pred_mv
_s8
[
1
].
as_int
;
mbmi
->
pred_mv
[
0
].
as_int
=
mi
->
bmi
[
3
].
pred_mv
[
0
].
as_int
;
mbmi
->
pred_mv
[
1
].
as_int
=
mi
->
bmi
[
3
].
pred_mv
[
1
].
as_int
;
#endif
mi
->
mbmi
.
mode
=
b_mode
;
...
...
av1/encoder/bitstream.c
View file @
f5bbbfad
...
...
@@ -1269,7 +1269,7 @@ static void pack_inter_mode_mvs(AV1_COMP *cpi, const MODE_INFO *mi,
#endif
#else
#if CONFIG_REF_MV
&
mi
->
bmi
[
j
].
pred_mv
_s8
[
ref
].
as_mv
,
is_compound
,
&
mi
->
bmi
[
j
].
pred_mv
[
ref
].
as_mv
,
is_compound
,
#else
&
mbmi_ext
->
ref_mvs
[
mbmi
->
ref_frame
[
ref
]][
0
].
as_mv
,
#endif // CONFIG_REF_MV
...
...
av1/encoder/encodemv.c
View file @
f5bbbfad
...
...
@@ -430,7 +430,7 @@ void av1_update_mv_count(ThreadData *td) {
if
(
mi
->
bmi
[
i
].
as_mode
==
NEWMV
)
inc_mvs
(
mbmi
,
mbmi_ext
,
mi
->
bmi
[
i
].
as_mv
,
#if CONFIG_REF_MV
mi
->
bmi
[
i
].
pred_mv
_s8
,
td
->
counts
->
mv
);
mi
->
bmi
[
i
].
pred_mv
,
td
->
counts
->
mv
);
#else
&
td
->
counts
->
mv
);
#endif
...
...
av1/encoder/rdopt.c
View file @
f5bbbfad
...
...
@@ -4264,11 +4264,11 @@ static int set_and_cost_bmi_mvs(AV1_COMP *cpi, MACROBLOCK *x, MACROBLOCKD *xd,
#if CONFIG_REF_MV
if (mode == NEWMV) {
mic->bmi[i].pred_mv
_s8
[0].as_int = best_ref_mv[0]->as_int;
if (is_compound) mic->bmi[i].pred_mv
_s8
[1].as_int = best_ref_mv[1]->as_int;
mic->bmi[i].pred_mv[0].as_int = best_ref_mv[0]->as_int;
if (is_compound) mic->bmi[i].pred_mv[1].as_int = best_ref_mv[1]->as_int;
} else {
mic->bmi[i].pred_mv
_s8
[0].as_int = this_mv[0].as_int;
if (is_compound) mic->bmi[i].pred_mv
_s8
[1].as_int = this_mv[1].as_int;
mic->bmi[i].pred_mv[0].as_int = this_mv[0].as_int;
if (is_compound) mic->bmi[i].pred_mv[1].as_int = this_mv[1].as_int;
}
#endif
...
...
@@ -5325,13 +5325,13 @@ static int64_t rd_pick_best_sub8x8_mode(
mode_mv[this_mode][ref].as_int;
#if CONFIG_REF_MV
bsi->rdstat[i][mode_idx].pred_mv[ref].as_int =
mi->bmi[i].pred_mv
_s8
[ref].as_int;
mi->bmi[i].pred_mv[ref].as_int;
if (num_4x4_blocks_wide > 1)
bsi->rdstat[i + 1][mode_idx].pred_mv[ref].as_int =
mi->bmi[i].pred_mv
_s8
[ref].as_int;
mi->bmi[i].pred_mv[ref].as_int;
if (num_4x4_blocks_high > 1)
bsi->rdstat[i + 2][mode_idx].pred_mv[ref].as_int =
mi->bmi[i].pred_mv
_s8
[ref].as_int;
mi->bmi[i].pred_mv[ref].as_int;
#endif
#if CONFIG_EXT_INTER
bsi->rdstat[i][mode_idx].ref_mv[ref].as_int =
...
...
@@ -5556,9 +5556,9 @@ static int64_t rd_pick_best_sub8x8_mode(
if (has_second_ref(mbmi))
mi->bmi[idx].as_mv[1].as_int = bsi->rdstat[idx][mode_idx].mvs[1].as_int;
#if CONFIG_REF_MV
mi->bmi[idx].pred_mv
_s8
[0] = bsi->rdstat[idx][mode_idx].pred_mv[0];
mi->bmi[idx].pred_mv[0] = bsi->rdstat[idx][mode_idx].pred_mv[0];
if (has_second_ref(mbmi))
mi->bmi[idx].pred_mv
_s8
[1] = bsi->rdstat[idx][mode_idx].pred_mv[1];
mi->bmi[idx].pred_mv[1] = bsi->rdstat[idx][mode_idx].pred_mv[1];
#endif
#if CONFIG_EXT_INTER
mi->bmi[idx].ref_mv[0].as_int = bsi->rdstat[idx][mode_idx].ref_mv[0].as_int;
...
...
@@ -10682,8 +10682,8 @@ void av1_rd_pick_inter_mode_sub8x8(struct AV1_COMP *cpi, TileDataEnc *tile_data,
mbmi->mv[0].as_int = xd->mi[0]->bmi[3].as_mv[0].as_int;
mbmi->mv[1].as_int = xd->mi[0]->bmi[3].as_mv[1].as_int;
#if CONFIG_REF_MV
mbmi->pred_mv[0].as_int = xd->mi[0]->bmi[3].pred_mv
_s8
[0].as_int;
mbmi->pred_mv[1].as_int = xd->mi[0]->bmi[3].pred_mv
_s8
[1].as_int;
mbmi->pred_mv[0].as_int = xd->mi[0]->bmi[3].pred_mv[0].as_int;
mbmi->pred_mv[1].as_int = xd->mi[0]->bmi[3].pred_mv[1].as_int;
#endif
}
...
...
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