libvpx: Pull from upstream

source/libvpx/vp9/common/vp9_entropy.h

 /*
  *  Copyright (c) 2010 The WebM project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 32 matching lines @@
 
 extern struct vp9_token vp9_coef_encodings[MAX_ENTROPY_TOKENS];
 
 typedef struct {
   vp9_tree_p tree;
   const vp9_prob *prob;
   int len;
   int base_val;
 } vp9_extra_bit;
 
-extern vp9_extra_bit vp9_extra_bits[12];    /* indexed by token value */
+extern const vp9_extra_bit vp9_extra_bits[12];    /* indexed by token value */
 
 #define MAX_PROB                255
 #define DCT_MAX_VALUE           16384
 
 /* Coefficients are predicted via a 3-dimensional probability table. */
 
 /* Outside dimension.  0 = Y with DC, 1 = UV */
 #define BLOCK_TYPES 2
 #define REF_TYPES 2  // intra=0, inter=1
 
 /* Middle dimension reflects the coefficient position within the transform. */
 #define COEF_BANDS 6
 
 /* Inside dimension is measure of nearby complexity, that reflects the energy
    of nearby coefficients are nonzero.  For the first coefficient (DC, unless
    block type is 0), we look at the (already encoded) blocks above and to the
    left of the current block.  The context index is then the number (0,1,or 2)
    of these blocks having nonzero coefficients.
    After decoding a coefficient, the measure is determined by the size of the
    most recently decoded coefficient.
    Note that the intuitive meaning of this measure changes as coefficients
    are decoded, e.g., prior to the first token, a zero means that my neighbors
    are empty while, after the first token, because of the use of end-of-block,
    a zero means we just decoded a zero and hence guarantees that a non-zero
    coefficient will appear later in this block.  However, this shift
    in meaning is perfectly OK because our context depends also on the
    coefficient band (and since zigzag positions 0, 1, and 2 are in
    distinct bands). */
 
-/*# define DC_TOKEN_CONTEXTS        3*/ /* 00, 0!0, !0!0 */
 #define PREV_COEF_CONTEXTS          6
 
 // #define ENTROPY_STATS
 
 typedef unsigned int vp9_coeff_count[REF_TYPES][COEF_BANDS][PREV_COEF_CONTEXTS]
                                     [MAX_ENTROPY_TOKENS];
 typedef unsigned int vp9_coeff_stats[REF_TYPES][COEF_BANDS][PREV_COEF_CONTEXTS]
                                     [ENTROPY_NODES][2];
 typedef vp9_prob vp9_coeff_probs[REF_TYPES][COEF_BANDS][PREV_COEF_CONTEXTS]
                                 [ENTROPY_NODES];
 
 #define SUBEXP_PARAM                4   /* Subexponential code parameter */
 #define MODULUS_PARAM               13  /* Modulus parameter */
 
 struct VP9Common;
 void vp9_default_coef_probs(struct VP9Common *);
 extern DECLARE_ALIGNED(16, const int16_t, vp9_default_scan_4x4[16]);
 
 extern DECLARE_ALIGNED(16, const int16_t, vp9_col_scan_4x4[16]);
 extern DECLARE_ALIGNED(16, const int16_t, vp9_row_scan_4x4[16]);
 
-extern DECLARE_ALIGNED(64, const int16_t, vp9_default_scan_8x8[64]);
+extern DECLARE_ALIGNED(16, const int16_t, vp9_default_scan_8x8[64]);
 
 extern DECLARE_ALIGNED(16, const int16_t, vp9_col_scan_8x8[64]);
 extern DECLARE_ALIGNED(16, const int16_t, vp9_row_scan_8x8[64]);
 
 extern DECLARE_ALIGNED(16, const int16_t, vp9_default_scan_16x16[256]);
 
 extern DECLARE_ALIGNED(16, const int16_t, vp9_col_scan_16x16[256]);
 extern DECLARE_ALIGNED(16, const int16_t, vp9_row_scan_16x16[256]);
 
 extern DECLARE_ALIGNED(16, const int16_t, vp9_default_scan_32x32[1024]);
 
 extern DECLARE_ALIGNED(16, int16_t, vp9_default_iscan_4x4[16]);
 
 extern DECLARE_ALIGNED(16, int16_t, vp9_col_iscan_4x4[16]);
 extern DECLARE_ALIGNED(16, int16_t, vp9_row_iscan_4x4[16]);
 
-extern DECLARE_ALIGNED(64, int16_t, vp9_default_iscan_8x8[64]);
+extern DECLARE_ALIGNED(16, int16_t, vp9_default_iscan_8x8[64]);
 
 extern DECLARE_ALIGNED(16, int16_t, vp9_col_iscan_8x8[64]);
 extern DECLARE_ALIGNED(16, int16_t, vp9_row_iscan_8x8[64]);
 
 extern DECLARE_ALIGNED(16, int16_t, vp9_default_iscan_16x16[256]);
 
 extern DECLARE_ALIGNED(16, int16_t, vp9_col_iscan_16x16[256]);
 extern DECLARE_ALIGNED(16, int16_t, vp9_row_iscan_16x16[256]);
 
 extern DECLARE_ALIGNED(16, int16_t, vp9_default_iscan_32x32[1024]);
@@ skipping 17 matching lines @@
 extern DECLARE_ALIGNED(16, int16_t,
                        vp9_row_scan_16x16_neighbors[257 * MAX_NEIGHBORS]);
 extern DECLARE_ALIGNED(16, int16_t,
                        vp9_default_scan_16x16_neighbors[257 * MAX_NEIGHBORS]);
 extern DECLARE_ALIGNED(16, int16_t,
                        vp9_default_scan_32x32_neighbors[1025 * MAX_NEIGHBORS]);
 
 void vp9_coef_tree_initialize(void);
 void vp9_adapt_coef_probs(struct VP9Common *);
 
-static INLINE void vp9_reset_sb_tokens_context(MACROBLOCKD* const xd,
-                                               BLOCK_SIZE_TYPE bsize) {
-  /* Clear entropy contexts */
-  const int bw = 1 << b_width_log2(bsize);
-  const int bh = 1 << b_height_log2(bsize);
+static INLINE void reset_skip_context(MACROBLOCKD *xd, BLOCK_SIZE bsize) {
   int i;
   for (i = 0; i < MAX_MB_PLANE; i++) {
-    vpx_memset(xd->plane[i].above_context, 0,
-               sizeof(ENTROPY_CONTEXT) * bw >> xd->plane[i].subsampling_x);
-    vpx_memset(xd->plane[i].left_context, 0,
-               sizeof(ENTROPY_CONTEXT) * bh >> xd->plane[i].subsampling_y);
+    struct macroblockd_plane *const pd = &xd->plane[i];
+    const BLOCK_SIZE plane_bsize = get_plane_block_size(bsize, pd);
+    vpx_memset(pd->above_context, 0, sizeof(ENTROPY_CONTEXT) *
+                   num_4x4_blocks_wide_lookup[plane_bsize]);
+    vpx_memset(pd->left_context, 0, sizeof(ENTROPY_CONTEXT) *
+                   num_4x4_blocks_high_lookup[plane_bsize]);
   }
 }
 
 // This is the index in the scan order beyond which all coefficients for
 // 8x8 transform and above are in the top band.
 // For 4x4 blocks the index is less but to keep things common the lookup
 // table for 4x4 is padded out to this index.
 #define MAXBAND_INDEX 21
 
 extern const uint8_t vp9_coefband_trans_8x8plus[MAXBAND_INDEX + 1];
@@ skipping 154 matching lines @@
     case DCT_ADST:
       return vp9_col_iscan_16x16;
     default:
       return vp9_default_iscan_16x16;
   }
 }
 
 enum { VP9_COEF_UPDATE_PROB = 252 };
 
 #endif  // VP9_COMMON_VP9_ENTROPY_H_