shithub: libvpx

Info  •  Files  •  Log  •  Branches

Renaming NMV_UPDATE_PROB to MV_UPDATE_PROB.

Change-Id: I7f3bcca103f0b1f6b3c064b61472543de9a8288a

--- a/vp9/common/vp9_entropymv.h

+++ b/vp9/common/vp9_entropymv.h

@@ -26,7 +26,7 @@

 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

--- a/vp9/decoder/vp9_decodeframe.c

+++ b/vp9/decoder/vp9_decodeframe.c

@@ -146,7 +146,7 @@

 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;

 }

--- a/vp9/encoder/vp9_encodemv.c

+++ b/vp9/encoder/vp9_encodemv.c

@@ -160,7 +160,7 @@

   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 @@

     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 @@

   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);

     }

   }

 }