| OLD | NEW |
|---|
| 1 /* | 1 /* |
| 2 * Copyright (c) 2010 The WebM project authors. All Rights Reserved. | 2 * Copyright (c) 2010 The WebM project authors. All Rights Reserved. |
| 3 * | 3 * |
| 4 * Use of this source code is governed by a BSD-style license | 4 * Use of this source code is governed by a BSD-style license |
| 5 * that can be found in the LICENSE file in the root of the source | 5 * that can be found in the LICENSE file in the root of the source |
| 6 * tree. An additional intellectual property rights grant can be found | 6 * tree. An additional intellectual property rights grant can be found |
| 7 * in the file PATENTS. All contributing project authors may | 7 * in the file PATENTS. All contributing project authors may |
| 8 * be found in the AUTHORS file in the root of the source tree. | 8 * be found in the AUTHORS file in the root of the source tree. |
| 9 */ | 9 */ |
| 10 | 10 |
| 11 #ifndef VP9_COMMON_VP9_RECONINTRA_H_ | 11 #ifndef VP9_COMMON_VP9_RECONINTRA_H_ |
| 12 #define VP9_COMMON_VP9_RECONINTRA_H_ | 12 #define VP9_COMMON_VP9_RECONINTRA_H_ |
| 13 | 13 |
| 14 #include "vpx/vpx_integer.h" |
| 14 #include "vp9/common/vp9_blockd.h" | 15 #include "vp9/common/vp9_blockd.h" |
| 15 | 16 |
| 16 extern void vp9_recon_intra_mbuv(MACROBLOCKD *xd); | 17 extern void vp9_recon_intra_mbuv(MACROBLOCKD *xd); |
| 17 extern B_PREDICTION_MODE vp9_find_dominant_direction(unsigned char *ptr, | 18 extern B_PREDICTION_MODE vp9_find_dominant_direction(uint8_t *ptr, |
| 18 int stride, int n); | 19 int stride, int n); |
| 19 extern B_PREDICTION_MODE vp9_find_bpred_context(BLOCKD *x); | 20 extern B_PREDICTION_MODE vp9_find_bpred_context(BLOCKD *x); |
| 20 #if CONFIG_COMP_INTERINTRA_PRED | 21 #if CONFIG_COMP_INTERINTRA_PRED |
| 21 extern void vp9_build_interintra_16x16_predictors_mb(MACROBLOCKD *xd, | 22 extern void vp9_build_interintra_16x16_predictors_mb(MACROBLOCKD *xd, |
| 22 unsigned char *ypred, | 23 uint8_t *ypred, |
| 23 unsigned char *upred, | 24 uint8_t *upred, |
| 24 unsigned char *vpred, | 25 uint8_t *vpred, |
| 25 int ystride, | 26 int ystride, |
| 26 int uvstride); | 27 int uvstride); |
| 27 extern void vp9_build_interintra_16x16_predictors_mby(MACROBLOCKD *xd, | 28 extern void vp9_build_interintra_16x16_predictors_mby(MACROBLOCKD *xd, |
| 28 unsigned char *ypred, | 29 uint8_t *ypred, |
| 29 int ystride); | 30 int ystride); |
| 30 extern void vp9_build_interintra_16x16_predictors_mbuv(MACROBLOCKD *xd, | 31 extern void vp9_build_interintra_16x16_predictors_mbuv(MACROBLOCKD *xd, |
| 31 unsigned char *upred, | 32 uint8_t *upred, |
| 32 unsigned char *vpred, | 33 uint8_t *vpred, |
| 33 int uvstride); | 34 int uvstride); |
| 34 #if CONFIG_SUPERBLOCKS | 35 #endif // CONFIG_COMP_INTERINTRA_PRED |
| 36 |
| 35 extern void vp9_build_interintra_32x32_predictors_sb(MACROBLOCKD *xd, | 37 extern void vp9_build_interintra_32x32_predictors_sb(MACROBLOCKD *xd, |
| 36 unsigned char *ypred, | 38 uint8_t *ypred, |
| 37 unsigned char *upred, | 39 uint8_t *upred, |
| 38 unsigned char *vpred, | 40 uint8_t *vpred, |
| 39 int ystride, | 41 int ystride, |
| 40 int uvstride); | 42 int uvstride); |
| 41 #endif | 43 extern void vp9_build_interintra_64x64_predictors_sb(MACROBLOCKD *xd, |
| 42 #endif | 44 uint8_t *ypred, |
| 45 uint8_t *upred, |
| 46 uint8_t *vpred, |
| 47 int ystride, |
| 48 int uvstride); |
| 43 | 49 |
| 44 #endif // __INC_RECONINTRA_H | 50 #endif // VP9_COMMON_VP9_RECONINTRA_H_ |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 11974002:
libvpx: Pull from upstream (Closed)
Base URL: svn://chrome-svn/chrome/trunk/deps/third_party/libvpx/