mirror of
https://repo.dactyloidae.xyz/Dactyloidae/UXP.git
synced 2026-10-09 08:47:31 +09:00
Update aom to slightly newer commit ID
This commit is contained in:
trav90
Roy Tam
parent
1c8af26369
commit
76f1e6edca
311 changed files with 55292 additions and 33790 deletions
124
third_party/aom/av1/encoder/encodemv.c
vendored
124
third_party/aom/av1/encoder/encodemv.c
vendored
|
|
@ -45,13 +45,8 @@ static void encode_mv_component(aom_writer *w, int comp, nmv_component *mvcomp,
|
|||
// Sign
|
||||
aom_write(w, sign, mvcomp->sign);
|
||||
|
||||
// Class
|
||||
#if CONFIG_EC_MULTISYMBOL
|
||||
// Class
|
||||
aom_write_symbol(w, mv_class, mvcomp->class_cdf, MV_CLASSES);
|
||||
#else
|
||||
av1_write_token(w, av1_mv_class_tree, mvcomp->classes,
|
||||
&mv_class_encodings[mv_class]);
|
||||
#endif
|
||||
|
||||
// Integer bits
|
||||
if (mv_class == MV_CLASS_0) {
|
||||
|
|
@ -62,16 +57,10 @@ static void encode_mv_component(aom_writer *w, int comp, nmv_component *mvcomp,
|
|||
for (i = 0; i < n; ++i) aom_write(w, (d >> i) & 1, mvcomp->bits[i]);
|
||||
}
|
||||
|
||||
// Fractional bits
|
||||
#if CONFIG_EC_MULTISYMBOL
|
||||
// Fractional bits
|
||||
aom_write_symbol(
|
||||
w, fr, mv_class == MV_CLASS_0 ? mvcomp->class0_fp_cdf[d] : mvcomp->fp_cdf,
|
||||
MV_FP_SIZE);
|
||||
#else
|
||||
av1_write_token(w, av1_mv_fp_tree,
|
||||
mv_class == MV_CLASS_0 ? mvcomp->class0_fp[d] : mvcomp->fp,
|
||||
&mv_fp_encodings[fr]);
|
||||
#endif
|
||||
|
||||
// High precision bit
|
||||
if (usehp)
|
||||
|
|
@ -171,7 +160,6 @@ static void write_mv_update(const aom_tree_index *tree,
|
|||
void av1_write_nmv_probs(AV1_COMMON *cm, int usehp, aom_writer *w,
|
||||
nmv_context_counts *const nmv_counts) {
|
||||
int i;
|
||||
#if CONFIG_REF_MV
|
||||
int nmv_ctx = 0;
|
||||
for (nmv_ctx = 0; nmv_ctx < NMV_CONTEXTS; ++nmv_ctx) {
|
||||
nmv_context *const mvc = &cm->fc->nmvc[nmv_ctx];
|
||||
|
|
@ -213,57 +201,13 @@ void av1_write_nmv_probs(AV1_COMMON *cm, int usehp, aom_writer *w,
|
|||
}
|
||||
}
|
||||
}
|
||||
#else
|
||||
nmv_context *const mvc = &cm->fc->nmvc;
|
||||
nmv_context_counts *const counts = nmv_counts;
|
||||
|
||||
#if !CONFIG_EC_ADAPT
|
||||
write_mv_update(av1_mv_joint_tree, mvc->joints, counts->joints, MV_JOINTS, w);
|
||||
|
||||
for (i = 0; i < 2; ++i) {
|
||||
int j;
|
||||
nmv_component *comp = &mvc->comps[i];
|
||||
nmv_component_counts *comp_counts = &counts->comps[i];
|
||||
|
||||
update_mv(w, comp_counts->sign, &comp->sign, MV_UPDATE_PROB);
|
||||
write_mv_update(av1_mv_class_tree, comp->classes, comp_counts->classes,
|
||||
MV_CLASSES, w);
|
||||
write_mv_update(av1_mv_class0_tree, comp->class0, comp_counts->class0,
|
||||
CLASS0_SIZE, w);
|
||||
for (j = 0; j < MV_OFFSET_BITS; ++j)
|
||||
update_mv(w, comp_counts->bits[j], &comp->bits[j], MV_UPDATE_PROB);
|
||||
}
|
||||
|
||||
for (i = 0; i < 2; ++i) {
|
||||
int j;
|
||||
for (j = 0; j < CLASS0_SIZE; ++j) {
|
||||
write_mv_update(av1_mv_fp_tree, mvc->comps[i].class0_fp[j],
|
||||
counts->comps[i].class0_fp[j], MV_FP_SIZE, w);
|
||||
}
|
||||
write_mv_update(av1_mv_fp_tree, mvc->comps[i].fp, counts->comps[i].fp,
|
||||
MV_FP_SIZE, w);
|
||||
}
|
||||
#endif // !CONFIG_EC_ADAPT
|
||||
|
||||
if (usehp) {
|
||||
for (i = 0; i < 2; ++i) {
|
||||
update_mv(w, counts->comps[i].class0_hp, &mvc->comps[i].class0_hp,
|
||||
MV_UPDATE_PROB);
|
||||
update_mv(w, counts->comps[i].hp, &mvc->comps[i].hp, MV_UPDATE_PROB);
|
||||
}
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
||||
void av1_encode_mv(AV1_COMP *cpi, aom_writer *w, const MV *mv, const MV *ref,
|
||||
nmv_context *mvctx, int usehp) {
|
||||
const MV diff = { mv->row - ref->row, mv->col - ref->col };
|
||||
const MV_JOINT_TYPE j = av1_get_mv_joint(&diff);
|
||||
#if CONFIG_EC_MULTISYMBOL
|
||||
aom_write_symbol(w, j, mvctx->joint_cdf, MV_JOINTS);
|
||||
#else
|
||||
av1_write_token(w, av1_mv_joint_tree, mvctx->joints, &mv_joint_encodings[j]);
|
||||
#endif
|
||||
if (mv_joint_vertical(j))
|
||||
encode_mv_component(w, diff.row, &mvctx->comps[0], usehp);
|
||||
|
||||
|
|
@ -284,11 +228,7 @@ void av1_encode_dv(aom_writer *w, const MV *mv, const MV *ref,
|
|||
const MV diff = { mv->row - ref->row, mv->col - ref->col };
|
||||
const MV_JOINT_TYPE j = av1_get_mv_joint(&diff);
|
||||
|
||||
#if CONFIG_EC_MULTISYMBOL
|
||||
aom_write_symbol(w, j, mvctx->joint_cdf, MV_JOINTS);
|
||||
#else
|
||||
av1_write_token(w, av1_mv_joint_tree, mvctx->joints, &mv_joint_encodings[j]);
|
||||
#endif
|
||||
if (mv_joint_vertical(j))
|
||||
encode_mv_component(w, diff.row, &mvctx->comps[0], 0);
|
||||
|
||||
|
|
@ -306,135 +246,101 @@ void av1_build_nmv_cost_table(int *mvjoint, int *mvcost[2],
|
|||
|
||||
#if CONFIG_EXT_INTER
|
||||
static void inc_mvs(const MB_MODE_INFO *mbmi, const MB_MODE_INFO_EXT *mbmi_ext,
|
||||
const int_mv mvs[2],
|
||||
#if CONFIG_REF_MV
|
||||
const int_mv pred_mvs[2],
|
||||
#endif
|
||||
const int_mv mvs[2], const int_mv pred_mvs[2],
|
||||
nmv_context_counts *nmv_counts) {
|
||||
int i;
|
||||
PREDICTION_MODE mode = mbmi->mode;
|
||||
#if !CONFIG_REF_MV
|
||||
nmv_context_counts *counts = nmv_counts;
|
||||
#endif
|
||||
|
||||
if (mode == NEWMV || mode == NEW_NEWMV) {
|
||||
for (i = 0; i < 1 + has_second_ref(mbmi); ++i) {
|
||||
const MV *ref = &mbmi_ext->ref_mvs[mbmi->ref_frame[i]][0].as_mv;
|
||||
const MV diff = { mvs[i].as_mv.row - ref->row,
|
||||
mvs[i].as_mv.col - ref->col };
|
||||
#if CONFIG_REF_MV
|
||||
int8_t rf_type = av1_ref_frame_type(mbmi->ref_frame);
|
||||
int nmv_ctx =
|
||||
av1_nmv_ctx(mbmi_ext->ref_mv_count[rf_type],
|
||||
mbmi_ext->ref_mv_stack[rf_type], i, mbmi->ref_mv_idx);
|
||||
nmv_context_counts *counts = &nmv_counts[nmv_ctx];
|
||||
(void)pred_mvs;
|
||||
#endif
|
||||
av1_inc_mv(&diff, counts, 1);
|
||||
}
|
||||
} else if (mode == NEAREST_NEWMV || mode == NEAR_NEWMV) {
|
||||
const MV *ref = &mbmi_ext->ref_mvs[mbmi->ref_frame[1]][0].as_mv;
|
||||
const MV diff = { mvs[1].as_mv.row - ref->row,
|
||||
mvs[1].as_mv.col - ref->col };
|
||||
#if CONFIG_REF_MV
|
||||
int8_t rf_type = av1_ref_frame_type(mbmi->ref_frame);
|
||||
int nmv_ctx =
|
||||
av1_nmv_ctx(mbmi_ext->ref_mv_count[rf_type],
|
||||
mbmi_ext->ref_mv_stack[rf_type], 1, mbmi->ref_mv_idx);
|
||||
nmv_context_counts *counts = &nmv_counts[nmv_ctx];
|
||||
#endif
|
||||
av1_inc_mv(&diff, counts, 1);
|
||||
} else if (mode == NEW_NEARESTMV || mode == NEW_NEARMV) {
|
||||
const MV *ref = &mbmi_ext->ref_mvs[mbmi->ref_frame[0]][0].as_mv;
|
||||
const MV diff = { mvs[0].as_mv.row - ref->row,
|
||||
mvs[0].as_mv.col - ref->col };
|
||||
#if CONFIG_REF_MV
|
||||
int8_t rf_type = av1_ref_frame_type(mbmi->ref_frame);
|
||||
int nmv_ctx =
|
||||
av1_nmv_ctx(mbmi_ext->ref_mv_count[rf_type],
|
||||
mbmi_ext->ref_mv_stack[rf_type], 0, mbmi->ref_mv_idx);
|
||||
nmv_context_counts *counts = &nmv_counts[nmv_ctx];
|
||||
#endif
|
||||
av1_inc_mv(&diff, counts, 1);
|
||||
}
|
||||
}
|
||||
|
||||
static void inc_mvs_sub8x8(const MODE_INFO *mi, int block, const int_mv mvs[2],
|
||||
#if CONFIG_REF_MV
|
||||
const MB_MODE_INFO_EXT *mbmi_ext,
|
||||
#endif
|
||||
nmv_context_counts *nmv_counts) {
|
||||
int i;
|
||||
PREDICTION_MODE mode = mi->bmi[block].as_mode;
|
||||
#if CONFIG_REF_MV
|
||||
const MB_MODE_INFO *mbmi = &mi->mbmi;
|
||||
#else
|
||||
nmv_context_counts *counts = nmv_counts;
|
||||
#endif
|
||||
|
||||
if (mode == NEWMV || mode == NEW_NEWMV) {
|
||||
for (i = 0; i < 1 + has_second_ref(&mi->mbmi); ++i) {
|
||||
const MV *ref = &mi->bmi[block].ref_mv[i].as_mv;
|
||||
const MV diff = { mvs[i].as_mv.row - ref->row,
|
||||
mvs[i].as_mv.col - ref->col };
|
||||
#if CONFIG_REF_MV
|
||||
int8_t rf_type = av1_ref_frame_type(mbmi->ref_frame);
|
||||
int nmv_ctx =
|
||||
av1_nmv_ctx(mbmi_ext->ref_mv_count[rf_type],
|
||||
mbmi_ext->ref_mv_stack[rf_type], i, mbmi->ref_mv_idx);
|
||||
nmv_context_counts *counts = &nmv_counts[nmv_ctx];
|
||||
#endif
|
||||
av1_inc_mv(&diff, counts, 1);
|
||||
}
|
||||
} else if (mode == NEAREST_NEWMV || mode == NEAR_NEWMV) {
|
||||
const MV *ref = &mi->bmi[block].ref_mv[1].as_mv;
|
||||
const MV diff = { mvs[1].as_mv.row - ref->row,
|
||||
mvs[1].as_mv.col - ref->col };
|
||||
#if CONFIG_REF_MV
|
||||
int8_t rf_type = av1_ref_frame_type(mbmi->ref_frame);
|
||||
int nmv_ctx =
|
||||
av1_nmv_ctx(mbmi_ext->ref_mv_count[rf_type],
|
||||
mbmi_ext->ref_mv_stack[rf_type], 1, mbmi->ref_mv_idx);
|
||||
nmv_context_counts *counts = &nmv_counts[nmv_ctx];
|
||||
#endif
|
||||
av1_inc_mv(&diff, counts, 1);
|
||||
} else if (mode == NEW_NEARESTMV || mode == NEW_NEARMV) {
|
||||
const MV *ref = &mi->bmi[block].ref_mv[0].as_mv;
|
||||
const MV diff = { mvs[0].as_mv.row - ref->row,
|
||||
mvs[0].as_mv.col - ref->col };
|
||||
#if CONFIG_REF_MV
|
||||
int8_t rf_type = av1_ref_frame_type(mbmi->ref_frame);
|
||||
int nmv_ctx =
|
||||
av1_nmv_ctx(mbmi_ext->ref_mv_count[rf_type],
|
||||
mbmi_ext->ref_mv_stack[rf_type], 0, mbmi->ref_mv_idx);
|
||||
nmv_context_counts *counts = &nmv_counts[nmv_ctx];
|
||||
#endif
|
||||
av1_inc_mv(&diff, counts, 1);
|
||||
}
|
||||
}
|
||||
#else
|
||||
static void inc_mvs(const MB_MODE_INFO *mbmi, const MB_MODE_INFO_EXT *mbmi_ext,
|
||||
const int_mv mvs[2],
|
||||
#if CONFIG_REF_MV
|
||||
const int_mv pred_mvs[2],
|
||||
#endif
|
||||
const int_mv mvs[2], const int_mv pred_mvs[2],
|
||||
nmv_context_counts *nmv_counts) {
|
||||
int i;
|
||||
#if !CONFIG_REF_MV
|
||||
nmv_context_counts *counts = nmv_counts;
|
||||
#endif
|
||||
|
||||
for (i = 0; i < 1 + has_second_ref(mbmi); ++i) {
|
||||
#if CONFIG_REF_MV
|
||||
int8_t rf_type = av1_ref_frame_type(mbmi->ref_frame);
|
||||
int nmv_ctx =
|
||||
av1_nmv_ctx(mbmi_ext->ref_mv_count[rf_type],
|
||||
mbmi_ext->ref_mv_stack[rf_type], i, mbmi->ref_mv_idx);
|
||||
nmv_context_counts *counts = &nmv_counts[nmv_ctx];
|
||||
const MV *ref = &pred_mvs[i].as_mv;
|
||||
#else
|
||||
const MV *ref = &mbmi_ext->ref_mvs[mbmi->ref_frame[i]][0].as_mv;
|
||||
#endif
|
||||
const MV diff = { mvs[i].as_mv.row - ref->row,
|
||||
mvs[i].as_mv.col - ref->col };
|
||||
av1_inc_mv(&diff, counts, 1);
|
||||
|
|
@ -464,20 +370,11 @@ void av1_update_mv_count(ThreadData *td) {
|
|||
|
||||
#if CONFIG_EXT_INTER
|
||||
if (have_newmv_in_inter_mode(mi->bmi[i].as_mode))
|
||||
inc_mvs_sub8x8(mi, i, mi->bmi[i].as_mv,
|
||||
#if CONFIG_REF_MV
|
||||
mbmi_ext, td->counts->mv);
|
||||
#else
|
||||
&td->counts->mv);
|
||||
#endif
|
||||
inc_mvs_sub8x8(mi, i, mi->bmi[i].as_mv, mbmi_ext, td->counts->mv);
|
||||
#else
|
||||
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, td->counts->mv);
|
||||
#else
|
||||
&td->counts->mv);
|
||||
#endif
|
||||
inc_mvs(mbmi, mbmi_ext, mi->bmi[i].as_mv, mi->bmi[i].pred_mv,
|
||||
td->counts->mv);
|
||||
#endif // CONFIG_EXT_INTER
|
||||
}
|
||||
}
|
||||
|
|
@ -487,11 +384,6 @@ void av1_update_mv_count(ThreadData *td) {
|
|||
#else
|
||||
if (mbmi->mode == NEWMV)
|
||||
#endif // CONFIG_EXT_INTER
|
||||
inc_mvs(mbmi, mbmi_ext, mbmi->mv,
|
||||
#if CONFIG_REF_MV
|
||||
mbmi->pred_mv, td->counts->mv);
|
||||
#else
|
||||
&td->counts->mv);
|
||||
#endif
|
||||
inc_mvs(mbmi, mbmi_ext, mbmi->mv, mbmi->pred_mv, td->counts->mv);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue