diff options
| author | Dmitry Kovalev <dkovalev@google.com> | 2014-03-04 11:00:11 -0800 |
|---|---|---|
| committer | Dmitry Kovalev <dkovalev@google.com> | 2014-03-05 10:37:52 -0800 |
| commit | d31fc628a77a0e42c344c7a2d9e3873251c6ec7e (patch) | |
| tree | 0feab5302c1204c4ede8229f12b288284c578c1b /vp9 | |
| parent | d73c4ac84d2caa486c1ef96ef976506a49fd2be3 (diff) | |
| download | libvpx-d31fc628a77a0e42c344c7a2d9e3873251c6ec7e.tar libvpx-d31fc628a77a0e42c344c7a2d9e3873251c6ec7e.tar.gz libvpx-d31fc628a77a0e42c344c7a2d9e3873251c6ec7e.tar.bz2 libvpx-d31fc628a77a0e42c344c7a2d9e3873251c6ec7e.zip | |
Renaming NMV_UPDATE_PROB to MV_UPDATE_PROB.
Change-Id: I7f3bcca103f0b1f6b3c064b61472543de9a8288a
Diffstat (limited to 'vp9')
| -rw-r--r-- | vp9/common/vp9_entropymv.h | 2 | ||||
| -rw-r--r-- | vp9/decoder/vp9_decodeframe.c | 2 | ||||
| -rw-r--r-- | vp9/encoder/vp9_encodemv.c | 10 |
3 files changed, 7 insertions, 7 deletions
diff --git a/vp9/common/vp9_entropymv.h b/vp9/common/vp9_entropymv.h index 7e1f1479b..e7033e437 100644 --- a/vp9/common/vp9_entropymv.h +++ b/vp9/common/vp9_entropymv.h @@ -26,7 +26,7 @@ void vp9_init_mv_probs(struct VP9Common *cm); void vp9_adapt_mv_probs(struct VP9Common *cm, int usehp); int vp9_use_mv_hp(const MV *ref); -#define NMV_UPDATE_PROB 252 +#define MV_UPDATE_PROB 252 /* Symbols for coding which components are zero jointly */ #define MV_JOINTS 4 diff --git a/vp9/decoder/vp9_decodeframe.c b/vp9/decoder/vp9_decodeframe.c index 54a14f381..d2485b66a 100644 --- a/vp9/decoder/vp9_decodeframe.c +++ b/vp9/decoder/vp9_decodeframe.c @@ -146,7 +146,7 @@ static void read_frame_reference_mode_probs(VP9_COMMON *cm, vp9_reader *r) { static void update_mv_probs(vp9_prob *p, int n, vp9_reader *r) { int i; for (i = 0; i < n; ++i) - if (vp9_read(r, NMV_UPDATE_PROB)) + if (vp9_read(r, MV_UPDATE_PROB)) p[i] = (vp9_read_literal(r, 7) << 1) | 1; } diff --git a/vp9/encoder/vp9_encodemv.c b/vp9/encoder/vp9_encodemv.c index 507969951..33c2e2315 100644 --- a/vp9/encoder/vp9_encodemv.c +++ b/vp9/encoder/vp9_encodemv.c @@ -160,7 +160,7 @@ static void write_mv_update(const vp9_tree_index *tree, vp9_tree_probs_from_distribution(tree, branch_ct, counts); for (i = 0; i < n - 1; ++i) - update_mv(w, branch_ct[i], &probs[i], NMV_UPDATE_PROB); + update_mv(w, branch_ct[i], &probs[i], MV_UPDATE_PROB); } void vp9_write_nmv_probs(VP9_COMMON *cm, int usehp, vp9_writer *w) { @@ -174,13 +174,13 @@ void vp9_write_nmv_probs(VP9_COMMON *cm, int usehp, vp9_writer *w) { nmv_component *comp = &mvc->comps[i]; nmv_component_counts *comp_counts = &counts->comps[i]; - update_mv(w, comp_counts->sign, &comp->sign, NMV_UPDATE_PROB); + update_mv(w, comp_counts->sign, &comp->sign, MV_UPDATE_PROB); write_mv_update(vp9_mv_class_tree, comp->classes, comp_counts->classes, MV_CLASSES, w); write_mv_update(vp9_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], NMV_UPDATE_PROB); + update_mv(w, comp_counts->bits[j], &comp->bits[j], MV_UPDATE_PROB); } for (i = 0; i < 2; ++i) { @@ -195,8 +195,8 @@ void vp9_write_nmv_probs(VP9_COMMON *cm, int usehp, vp9_writer *w) { if (usehp) { for (i = 0; i < 2; ++i) { update_mv(w, counts->comps[i].class0_hp, &mvc->comps[i].class0_hp, - NMV_UPDATE_PROB); - update_mv(w, counts->comps[i].hp, &mvc->comps[i].hp, NMV_UPDATE_PROB); + MV_UPDATE_PROB); + update_mv(w, counts->comps[i].hp, &mvc->comps[i].hp, MV_UPDATE_PROB); } } } |