| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (c) 2012 The WebM project authors. All Rights Reserved. | 2 * Copyright (c) 2012 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 #include "vp9/common/vp9_type_aliases.h" | |
| 12 #include "vp9/common/vp9_onyxc_int.h" | 11 #include "vp9/common/vp9_onyxc_int.h" |
| 13 #include "vp9/common/vp9_blockd.h" | 12 #include "vp9/common/vp9_blockd.h" |
| 14 | 13 |
| 15 #ifndef VP9_COMMON_VP9_PRED_COMMON_H_ | 14 #ifndef VP9_COMMON_VP9_PRED_COMMON_H_ |
| 16 #define VP9_COMMON_VP9_PRED_COMMON_H_ | 15 #define VP9_COMMON_VP9_PRED_COMMON_H_ |
| 17 | 16 |
| 18 | 17 |
| 19 // Predicted items | 18 // Predicted items |
| 20 typedef enum { | 19 typedef enum { |
| 21 PRED_SEG_ID = 0, // Segment identifier | 20 PRED_SEG_ID = 0, // Segment identifier |
| (...skipping 24 matching lines...) Expand all Loading... |
| 46 | 45 |
| 47 | 46 |
| 48 extern unsigned char vp9_get_pred_mb_segid(const VP9_COMMON *const cm, | 47 extern unsigned char vp9_get_pred_mb_segid(const VP9_COMMON *const cm, |
| 49 const MACROBLOCKD *const xd, | 48 const MACROBLOCKD *const xd, |
| 50 int MbIndex); | 49 int MbIndex); |
| 51 | 50 |
| 52 extern MV_REFERENCE_FRAME vp9_get_pred_ref(const VP9_COMMON *const cm, | 51 extern MV_REFERENCE_FRAME vp9_get_pred_ref(const VP9_COMMON *const cm, |
| 53 const MACROBLOCKD *const xd); | 52 const MACROBLOCKD *const xd); |
| 54 extern void vp9_compute_mod_refprobs(VP9_COMMON *const cm); | 53 extern void vp9_compute_mod_refprobs(VP9_COMMON *const cm); |
| 55 | 54 |
| 56 #endif /* __INC_PRED_COMMON_H__ */ | 55 #endif // VP9_COMMON_VP9_PRED_COMMON_H_ |
| OLD | NEW |