mirror of
https://repo.dactyloidae.xyz/Dactyloidae/UXP.git
synced 2026-10-09 08:47:31 +09:00
Update aom to commit id f5bdeac22930ff4c6b219be49c843db35970b918
This commit is contained in:
trav90
Roy Tam
parent
e329bc4331
commit
2ab8fcbfd1
370 changed files with 56185 additions and 32026 deletions
143
third_party/aom/av1/encoder/encodemv.c
vendored
143
third_party/aom/av1/encoder/encodemv.c
vendored
|
|
@ -31,7 +31,7 @@ void av1_entropy_mv_init(void) {
|
|||
}
|
||||
|
||||
static void encode_mv_component(aom_writer *w, int comp, nmv_component *mvcomp,
|
||||
int usehp) {
|
||||
MvSubpelPrecision precision) {
|
||||
int offset;
|
||||
const int sign = comp < 0;
|
||||
const int mag = sign ? -comp : comp;
|
||||
|
|
@ -42,34 +42,53 @@ static void encode_mv_component(aom_writer *w, int comp, nmv_component *mvcomp,
|
|||
|
||||
assert(comp != 0);
|
||||
|
||||
// Sign
|
||||
// Sign
|
||||
#if CONFIG_NEW_MULTISYMBOL
|
||||
aom_write_bit(w, sign);
|
||||
#else
|
||||
aom_write(w, sign, mvcomp->sign);
|
||||
#endif
|
||||
|
||||
// Class
|
||||
aom_write_symbol(w, mv_class, mvcomp->class_cdf, MV_CLASSES);
|
||||
|
||||
// Integer bits
|
||||
if (mv_class == MV_CLASS_0) {
|
||||
#if CONFIG_NEW_MULTISYMBOL
|
||||
aom_write_symbol(w, d, mvcomp->class0_cdf, CLASS0_SIZE);
|
||||
#else
|
||||
aom_write(w, d, mvcomp->class0[0]);
|
||||
#endif
|
||||
} else {
|
||||
int i;
|
||||
const int n = mv_class + CLASS0_BITS - 1; // number of bits
|
||||
for (i = 0; i < n; ++i) aom_write(w, (d >> i) & 1, mvcomp->bits[i]);
|
||||
}
|
||||
|
||||
// Fractional bits
|
||||
aom_write_symbol(
|
||||
w, fr, mv_class == MV_CLASS_0 ? mvcomp->class0_fp_cdf[d] : mvcomp->fp_cdf,
|
||||
MV_FP_SIZE);
|
||||
// Fractional bits
|
||||
#if CONFIG_INTRABC
|
||||
if (precision > MV_SUBPEL_NONE)
|
||||
#endif // CONFIG_INTRABC
|
||||
{
|
||||
aom_write_symbol(w, fr, mv_class == MV_CLASS_0 ? mvcomp->class0_fp_cdf[d]
|
||||
: mvcomp->fp_cdf,
|
||||
MV_FP_SIZE);
|
||||
}
|
||||
|
||||
// High precision bit
|
||||
if (usehp)
|
||||
if (precision > MV_SUBPEL_LOW_PRECISION)
|
||||
#if CONFIG_NEW_MULTISYMBOL
|
||||
aom_write_symbol(
|
||||
w, hp, mv_class == MV_CLASS_0 ? mvcomp->class0_hp_cdf : mvcomp->hp_cdf,
|
||||
2);
|
||||
#else
|
||||
aom_write(w, hp, mv_class == MV_CLASS_0 ? mvcomp->class0_hp : mvcomp->hp);
|
||||
#endif
|
||||
}
|
||||
|
||||
static void build_nmv_component_cost_table(int *mvcost,
|
||||
const nmv_component *const mvcomp,
|
||||
int usehp) {
|
||||
MvSubpelPrecision precision) {
|
||||
int i, v;
|
||||
int sign_cost[2], class_cost[MV_CLASSES], class0_cost[CLASS0_SIZE];
|
||||
int bits_cost[MV_OFFSET_BITS][2];
|
||||
|
|
@ -89,7 +108,7 @@ static void build_nmv_component_cost_table(int *mvcost,
|
|||
av1_cost_tokens(class0_fp_cost[i], mvcomp->class0_fp[i], av1_mv_fp_tree);
|
||||
av1_cost_tokens(fp_cost, mvcomp->fp, av1_mv_fp_tree);
|
||||
|
||||
if (usehp) {
|
||||
if (precision > MV_SUBPEL_LOW_PRECISION) {
|
||||
class0_hp_cost[0] = av1_cost_zero(mvcomp->class0_hp);
|
||||
class0_hp_cost[1] = av1_cost_one(mvcomp->class0_hp);
|
||||
hp_cost[0] = av1_cost_zero(mvcomp->hp);
|
||||
|
|
@ -110,16 +129,21 @@ static void build_nmv_component_cost_table(int *mvcost,
|
|||
const int b = c + CLASS0_BITS - 1; /* number of bits */
|
||||
for (i = 0; i < b; ++i) cost += bits_cost[i][((d >> i) & 1)];
|
||||
}
|
||||
if (c == MV_CLASS_0) {
|
||||
cost += class0_fp_cost[d][f];
|
||||
} else {
|
||||
cost += fp_cost[f];
|
||||
}
|
||||
if (usehp) {
|
||||
#if CONFIG_INTRABC
|
||||
if (precision > MV_SUBPEL_NONE)
|
||||
#endif // CONFIG_INTRABC
|
||||
{
|
||||
if (c == MV_CLASS_0) {
|
||||
cost += class0_hp_cost[e];
|
||||
cost += class0_fp_cost[d][f];
|
||||
} else {
|
||||
cost += hp_cost[e];
|
||||
cost += fp_cost[f];
|
||||
}
|
||||
if (precision > MV_SUBPEL_LOW_PRECISION) {
|
||||
if (c == MV_CLASS_0) {
|
||||
cost += class0_hp_cost[e];
|
||||
} else {
|
||||
cost += hp_cost[e];
|
||||
}
|
||||
}
|
||||
}
|
||||
mvcost[v] = cost + sign_cost[0];
|
||||
|
|
@ -127,36 +151,16 @@ static void build_nmv_component_cost_table(int *mvcost,
|
|||
}
|
||||
}
|
||||
|
||||
#if !CONFIG_NEW_MULTISYMBOL
|
||||
static void update_mv(aom_writer *w, const unsigned int ct[2], aom_prob *cur_p,
|
||||
aom_prob upd_p) {
|
||||
(void)upd_p;
|
||||
#if CONFIG_TILE_GROUPS
|
||||
// Just use the default maximum number of tile groups to avoid passing in the
|
||||
// actual
|
||||
// number
|
||||
av1_cond_prob_diff_update(w, cur_p, ct, DEFAULT_MAX_NUM_TG);
|
||||
#else
|
||||
av1_cond_prob_diff_update(w, cur_p, ct, 1);
|
||||
#endif
|
||||
}
|
||||
|
||||
#if !CONFIG_EC_ADAPT
|
||||
static void write_mv_update(const aom_tree_index *tree,
|
||||
aom_prob probs[/*n - 1*/],
|
||||
const unsigned int counts[/*n - 1*/], int n,
|
||||
aom_writer *w) {
|
||||
int i;
|
||||
unsigned int branch_ct[32][2];
|
||||
|
||||
// Assuming max number of probabilities <= 32
|
||||
assert(n <= 32);
|
||||
|
||||
av1_tree_probs_from_distribution(tree, branch_ct, counts);
|
||||
for (i = 0; i < n - 1; ++i)
|
||||
update_mv(w, branch_ct[i], &probs[i], MV_UPDATE_PROB);
|
||||
}
|
||||
#endif
|
||||
|
||||
void av1_write_nmv_probs(AV1_COMMON *cm, int usehp, aom_writer *w,
|
||||
nmv_context_counts *const nmv_counts) {
|
||||
int i;
|
||||
|
|
@ -164,34 +168,6 @@ void av1_write_nmv_probs(AV1_COMMON *cm, int usehp, aom_writer *w,
|
|||
for (nmv_ctx = 0; nmv_ctx < NMV_CONTEXTS; ++nmv_ctx) {
|
||||
nmv_context *const mvc = &cm->fc->nmvc[nmv_ctx];
|
||||
nmv_context_counts *const counts = &nmv_counts[nmv_ctx];
|
||||
#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
|
||||
|
||||
if (usehp) {
|
||||
for (i = 0; i < 2; ++i) {
|
||||
|
|
@ -202,6 +178,7 @@ void av1_write_nmv_probs(AV1_COMMON *cm, int usehp, aom_writer *w,
|
|||
}
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
void av1_encode_mv(AV1_COMP *cpi, aom_writer *w, const MV *mv, const MV *ref,
|
||||
nmv_context *mvctx, int usehp) {
|
||||
|
|
@ -230,18 +207,19 @@ void av1_encode_dv(aom_writer *w, const MV *mv, const MV *ref,
|
|||
|
||||
aom_write_symbol(w, j, mvctx->joint_cdf, MV_JOINTS);
|
||||
if (mv_joint_vertical(j))
|
||||
encode_mv_component(w, diff.row, &mvctx->comps[0], 0);
|
||||
encode_mv_component(w, diff.row, &mvctx->comps[0], MV_SUBPEL_NONE);
|
||||
|
||||
if (mv_joint_horizontal(j))
|
||||
encode_mv_component(w, diff.col, &mvctx->comps[1], 0);
|
||||
encode_mv_component(w, diff.col, &mvctx->comps[1], MV_SUBPEL_NONE);
|
||||
}
|
||||
#endif // CONFIG_INTRABC
|
||||
|
||||
void av1_build_nmv_cost_table(int *mvjoint, int *mvcost[2],
|
||||
const nmv_context *ctx, int usehp) {
|
||||
const nmv_context *ctx,
|
||||
MvSubpelPrecision precision) {
|
||||
av1_cost_tokens(mvjoint, ctx->joints, av1_mv_joint_tree);
|
||||
build_nmv_component_cost_table(mvcost[0], &ctx->comps[0], usehp);
|
||||
build_nmv_component_cost_table(mvcost[1], &ctx->comps[1], usehp);
|
||||
build_nmv_component_cost_table(mvcost[0], &ctx->comps[0], precision);
|
||||
build_nmv_component_cost_table(mvcost[1], &ctx->comps[1], precision);
|
||||
}
|
||||
|
||||
#if CONFIG_EXT_INTER
|
||||
|
|
@ -284,6 +262,27 @@ static void inc_mvs(const MB_MODE_INFO *mbmi, const MB_MODE_INFO_EXT *mbmi_ext,
|
|||
mbmi_ext->ref_mv_stack[rf_type], 0, mbmi->ref_mv_idx);
|
||||
nmv_context_counts *counts = &nmv_counts[nmv_ctx];
|
||||
av1_inc_mv(&diff, counts, 1);
|
||||
#if CONFIG_COMPOUND_SINGLEREF
|
||||
} else {
|
||||
assert( // mode == SR_NEAREST_NEWMV ||
|
||||
mode == SR_NEAR_NEWMV || mode == SR_ZERO_NEWMV || mode == SR_NEW_NEWMV);
|
||||
const MV *ref = &mbmi_ext->ref_mvs[mbmi->ref_frame[0]][0].as_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];
|
||||
(void)pred_mvs;
|
||||
MV diff;
|
||||
if (mode == SR_NEW_NEWMV) {
|
||||
diff.row = mvs[0].as_mv.row - ref->row;
|
||||
diff.col = mvs[0].as_mv.col - ref->col;
|
||||
av1_inc_mv(&diff, counts, 1);
|
||||
}
|
||||
diff.row = mvs[1].as_mv.row - ref->row;
|
||||
diff.col = mvs[1].as_mv.col - ref->col;
|
||||
av1_inc_mv(&diff, counts, 1);
|
||||
#endif // CONFIG_COMPOUND_SINGLEREF
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -328,7 +327,7 @@ static void inc_mvs_sub8x8(const MODE_INFO *mi, int block, const int_mv mvs[2],
|
|||
av1_inc_mv(&diff, counts, 1);
|
||||
}
|
||||
}
|
||||
#else
|
||||
#else // !CONFIG_EXT_INTER
|
||||
static void inc_mvs(const MB_MODE_INFO *mbmi, const MB_MODE_INFO_EXT *mbmi_ext,
|
||||
const int_mv mvs[2], const int_mv pred_mvs[2],
|
||||
nmv_context_counts *nmv_counts) {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue