shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "Code class0 using vpx_read() / vpx_write()."

--- a/vp9/decoder/vp9_decodemv.c

+++ b/vp9/decoder/vp9_decodemv.c

@@ -241,7 +241,7 @@

   // Integer part

   if (class0) {

-    d = vpx_read_tree(r, vp9_mv_class0_tree, mvcomp->class0);

+    d = vpx_read(r, mvcomp->class0[0]);

     mag = 0;

   } else {

     int i;

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

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

@@ -21,12 +21,10 @@

 static struct vp9_token mv_joint_encodings[MV_JOINTS];

 static struct vp9_token mv_class_encodings[MV_CLASSES];

 static struct vp9_token mv_fp_encodings[MV_FP_SIZE];

-static struct vp9_token mv_class0_encodings[CLASS0_SIZE];

 void vp9_entropy_mv_init(void) {

   vp9_tokens_from_tree(mv_joint_encodings, vp9_mv_joint_tree);

   vp9_tokens_from_tree(mv_class_encodings, vp9_mv_class_tree);

-  vp9_tokens_from_tree(mv_class0_encodings, vp9_mv_class0_tree);

   vp9_tokens_from_tree(mv_fp_encodings, vp9_mv_fp_tree);

 }

@@ -51,8 +49,7 @@

   // Integer bits

   if (mv_class == MV_CLASS_0) {

-    vp9_write_token(w, vp9_mv_class0_tree, mvcomp->class0,

-                    &mv_class0_encodings[d]);

+    vpx_write(w, d, mvcomp->class0[0]);

   } else {

     int i;

     const int n = mv_class + CLASS0_BITS - 1;  // number of bits