libvpx: Pull from upstream

source/libvpx/vp8/decoder/dboolhuff.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 10 matching lines @@
 
 typedef size_t VP8_BD_VALUE;
 
 #define VP8_BD_VALUE_SIZE ((int)sizeof(VP8_BD_VALUE)*CHAR_BIT)
 
 /*This is meant to be a large, positive constant that can still be efficiently
    loaded as an immediate (on platforms like ARM, for example).
   Even relatively modest values like 100 would work fine.*/
 #define VP8_LOTS_OF_BITS (0x40000000)
 
-static unsigned char decrypt_byte(const unsigned char *ch,
-                                  const unsigned char *origin,
-                                  const unsigned char *key)
-{
-#if CONFIG_DECRYPT
-    const int offset = (int)(ch - origin);
-    return *ch ^ key[offset % 32];  // VP8_DECRYPT_KEY_SIZE
-#else
-    return *ch;
-#endif
-}
+/*Decrypt n bytes of data from input -> output, using the decrypt_state
+   passed in VP8D_SET_DECRYPTOR.
+*/
+typedef void (vp8_decrypt_cb)(void *decrypt_state, const unsigned char *input,
+                              unsigned char *output, int count);
 
 typedef struct
 {
     const unsigned char *user_buffer_end;
     const unsigned char *user_buffer;
     VP8_BD_VALUE         value;
     int                  count;
     unsigned int         range;
-    const unsigned char *origin;
-    const unsigned char *key;
+    vp8_decrypt_cb      *decrypt_cb;
+    void                *decrypt_state;
 } BOOL_DECODER;
 
 DECLARE_ALIGNED(16, extern const unsigned char, vp8_norm[256]);
 
 int vp8dx_start_decode(BOOL_DECODER *br,
                        const unsigned char *source,
                        unsigned int source_sz,
-                       const unsigned char *origin,
-                       const unsigned char *key);
+                       vp8_decrypt_cb *decrypt_cb,
+                       void *decrypt_state);
 
 void vp8dx_bool_decoder_fill(BOOL_DECODER *br);
 
 
 static int vp8dx_decode_bool(BOOL_DECODER *br, int probability) {
     unsigned int bit = 0;
     VP8_BD_VALUE value;
     unsigned int split;
     VP8_BD_VALUE bigsplit;
     int count;
@@ skipping 64 matching lines @@
         * stream was encountered.
         */
         return 1;
     }
 
     /* No error. */
     return 0;
 }
 
 #endif  // DBOOLHUFF_H_