From: John Koleszar <jkoleszar@google.com>
Date: Wed, 26 Jun 2013 05:44:21 +0000 (-0700)
Subject: Merge "Move vp9_counts_to_nmv_context to encoder"
X-Git-Tag: v1.3.0~1015
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8137e24f3d29f200f2f45d5feb5b12452e7bd998;p=libvpx

Merge "Move vp9_counts_to_nmv_context to encoder"
---

8137e24f3d29f200f2f45d5feb5b12452e7bd998
diff --cc vp9/common/vp9_entropymv.h
index b0e821816,c2fd74bc6..de18dfb7a
--- a/vp9/common/vp9_entropymv.h
+++ b/vp9/common/vp9_entropymv.h
@@@ -121,22 -121,10 +121,10 @@@ typedef struct 
    nmv_component_counts comps[2];
  } nmv_context_counts;
  
 -void vp9_increment_nmv(const MV *mv, const MV *ref, nmv_context_counts *mvctx,
 -                       int usehp);
 +void vp9_inc_mv(const MV *mv, const MV *ref, nmv_context_counts *mvctx,
 +                int usehp);
  extern const nmv_context vp9_default_nmv_context;
- void vp9_counts_to_nmv_context(
-     nmv_context_counts *NMVcount,
-     nmv_context *prob,
-     int usehp,
-     unsigned int (*branch_ct_joint)[2],
-     unsigned int (*branch_ct_sign)[2],
-     unsigned int (*branch_ct_classes)[MV_CLASSES - 1][2],
-     unsigned int (*branch_ct_class0)[CLASS0_SIZE - 1][2],
-     unsigned int (*branch_ct_bits)[MV_OFFSET_BITS][2],
-     unsigned int (*branch_ct_class0_fp)[CLASS0_SIZE][4 - 1][2],
-     unsigned int (*branch_ct_fp)[4 - 1][2],
-     unsigned int (*branch_ct_class0_hp)[2],
-     unsigned int (*branch_ct_hp)[2]);
+ 
  void vp9_counts_process(nmv_context_counts *NMVcount, int usehp);
  
  #endif  // VP9_COMMON_VP9_ENTROPYMV_H_