From: Dmitry Kovalev <dkovalev@google.com>
Date: Thu, 27 Jun 2013 21:55:18 +0000 (-0700)
Subject: Merge "Moving subexp encoding functions in separate vp9_dsubexp.c file."
X-Git-Tag: v1.3.0~999
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=be83ef3104311fd507108e93a07b75f08d937e46;p=platform%2Fupstream%2Flibvpx.git

Merge "Moving subexp encoding functions in separate vp9_dsubexp.c file."
---

be83ef3104311fd507108e93a07b75f08d937e46
diff --cc vp9/decoder/vp9_decodemv.c
index 89ecef8,9bb7724..7ca69d0
--- a/vp9/decoder/vp9_decodemv.c
+++ b/vp9/decoder/vp9_decodemv.c
@@@ -374,29 -372,20 +371,20 @@@ static void mb_mode_mv_init(VP9D_COMP *
      if (cm->comp_pred_mode != SINGLE_PREDICTION_ONLY)
        for (i = 0; i < REF_CONTEXTS; i++)
          if (vp9_read(r, VP9_MODE_UPDATE_PROB))
-           cm->fc.comp_ref_prob[i] =
-               vp9_read_prob_diff_update(r, cm->fc.comp_ref_prob[i]);
+           vp9_diff_update_prob(r, &cm->fc.comp_ref_prob[i]);
  
      // VP9_INTRA_MODES
-     for (j = 0; j < BLOCK_SIZE_GROUPS; j++) {
-       for (i = 0; i < VP9_INTRA_MODES - 1; ++i) {
-         if (vp9_read(r, VP9_MODE_UPDATE_PROB)) {
-           cm->fc.y_mode_prob[j][i] =
-               vp9_read_prob_diff_update(r, cm->fc.y_mode_prob[j][i]);
-         }
-       }
-     }
-     for (j = 0; j < NUM_PARTITION_CONTEXTS; ++j) {
-       for (i = 0; i < PARTITION_TYPES - 1; ++i) {
-         if (vp9_read(r, VP9_MODE_UPDATE_PROB)) {
-           cm->fc.partition_prob[INTER_FRAME][j][i] =
-               vp9_read_prob_diff_update(r,
-                   cm->fc.partition_prob[INTER_FRAME][j][i]);
-         }
-       }
-     }
+     for (j = 0; j < BLOCK_SIZE_GROUPS; j++)
+       for (i = 0; i < VP9_INTRA_MODES - 1; ++i)
+         if (vp9_read(r, VP9_MODE_UPDATE_PROB))
+           vp9_diff_update_prob(r, &cm->fc.y_mode_prob[j][i]);
+ 
+     for (j = 0; j < NUM_PARTITION_CONTEXTS; ++j)
+       for (i = 0; i < PARTITION_TYPES - 1; ++i)
+         if (vp9_read(r, VP9_MODE_UPDATE_PROB))
+           vp9_diff_update_prob(r, &cm->fc.partition_prob[INTER_FRAME][j][i]);
  
 -    read_nmvprobs(r, nmvc, xd->allow_high_precision_mv);
 +    read_mv_probs(r, nmvc, xd->allow_high_precision_mv);
    }
  }