| 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 |
| (...skipping 106 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 117 static INLINE int mi_width_log2(BLOCK_SIZE sb_type) { | 117 static INLINE int mi_width_log2(BLOCK_SIZE sb_type) { |
| 118 return mi_width_log2_lookup[sb_type]; | 118 return mi_width_log2_lookup[sb_type]; |
| 119 } | 119 } |
| 120 | 120 |
| 121 // This structure now relates to 8x8 block regions. | 121 // This structure now relates to 8x8 block regions. |
| 122 typedef struct { | 122 typedef struct { |
| 123 // Common for both INTER and INTRA blocks | 123 // Common for both INTER and INTRA blocks |
| 124 BLOCK_SIZE sb_type; | 124 BLOCK_SIZE sb_type; |
| 125 PREDICTION_MODE mode; | 125 PREDICTION_MODE mode; |
| 126 TX_SIZE tx_size; | 126 TX_SIZE tx_size; |
| 127 uint8_t skip; | 127 int8_t skip; |
| 128 uint8_t segment_id; | 128 int8_t segment_id; |
| 129 uint8_t seg_id_predicted; // valid only when temporal_update is enabled | 129 int8_t seg_id_predicted; // valid only when temporal_update is enabled |
| 130 | 130 |
| 131 // Only for INTRA blocks | 131 // Only for INTRA blocks |
| 132 PREDICTION_MODE uv_mode; | 132 PREDICTION_MODE uv_mode; |
| 133 | 133 |
| 134 // Only for INTER blocks | 134 // Only for INTER blocks |
| 135 MV_REFERENCE_FRAME ref_frame[2]; | 135 MV_REFERENCE_FRAME ref_frame[2]; |
| 136 int_mv mv[2]; | 136 int_mv mv[2]; |
| 137 int_mv ref_mvs[MAX_REF_FRAMES][MAX_MV_REF_CANDIDATES]; | 137 int_mv ref_mvs[MAX_REF_FRAMES][MAX_MV_REF_CANDIDATES]; |
| 138 uint8_t mode_context[MAX_REF_FRAMES]; | 138 uint8_t mode_context[MAX_REF_FRAMES]; |
| 139 INTERP_FILTER interp_filter; | 139 INTERP_FILTER interp_filter; |
| (...skipping 172 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 312 | 312 |
| 313 void vp9_set_contexts(const MACROBLOCKD *xd, struct macroblockd_plane *pd, | 313 void vp9_set_contexts(const MACROBLOCKD *xd, struct macroblockd_plane *pd, |
| 314 BLOCK_SIZE plane_bsize, TX_SIZE tx_size, int has_eob, | 314 BLOCK_SIZE plane_bsize, TX_SIZE tx_size, int has_eob, |
| 315 int aoff, int loff); | 315 int aoff, int loff); |
| 316 | 316 |
| 317 #ifdef __cplusplus | 317 #ifdef __cplusplus |
| 318 } // extern "C" | 318 } // extern "C" |
| 319 #endif | 319 #endif |
| 320 | 320 |
| 321 #endif // VP9_COMMON_VP9_BLOCKD_H_ | 321 #endif // VP9_COMMON_VP9_BLOCKD_H_ |
| OLD | NEW |