libvpx: Pull from upstream

source/libvpx/vp9/common/vp9_common.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 46 matching lines @@
 }
 
 static INLINE double fclamp(double value, double low, double high) {
   return value < low ? low : (value > high ? high : value);
 }
 
 static INLINE int get_unsigned_bits(unsigned int num_values) {
   return num_values > 0 ? get_msb(num_values) + 1 : 0;
 }
 
+#if CONFIG_VP9_HIGHBITDEPTH
+#define CONVERT_TO_SHORTPTR(x) ((uint16_t*)(((uintptr_t)x) << 1))
+#define CONVERT_TO_BYTEPTR(x) ((uint8_t*)(((uintptr_t)x) >> 1 ))
+#endif  // CONFIG_VP9_HIGHBITDEPTH
+
 #if CONFIG_DEBUG
 #define CHECK_MEM_ERROR(cm, lval, expr) do { \
   lval = (expr); \
   if (!lval) \
     vpx_internal_error(&cm->error, VPX_CODEC_MEM_ERROR, \
                        "Failed to allocate "#lval" at %s:%d", \
                        __FILE__, __LINE__); \
   } while (0)
 #else
 #define CHECK_MEM_ERROR(cm, lval, expr) do { \
   lval = (expr); \
   if (!lval) \
     vpx_internal_error(&cm->error, VPX_CODEC_MEM_ERROR, \
                        "Failed to allocate "#lval); \
   } while (0)
 #endif
 
 #define VP9_SYNC_CODE_0 0x49
 #define VP9_SYNC_CODE_1 0x83
 #define VP9_SYNC_CODE_2 0x42
 
 #define VP9_FRAME_MARKER 0x2
 
 
 #ifdef __cplusplus
 }  // extern "C"
 #endif
 
 #endif  // VP9_COMMON_VP9_COMMON_H_