| 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 52 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 63 | 63 |
| 64 static int check_mv_bounds(int_mv *mv, | 64 static int check_mv_bounds(int_mv *mv, |
| 65 int mb_to_left_edge, int mb_to_right_edge, | 65 int mb_to_left_edge, int mb_to_right_edge, |
| 66 int mb_to_top_edge, int mb_to_bottom_edge) { | 66 int mb_to_top_edge, int mb_to_bottom_edge) { |
| 67 return mv->as_mv.col < mb_to_left_edge || | 67 return mv->as_mv.col < mb_to_left_edge || |
| 68 mv->as_mv.col > mb_to_right_edge || | 68 mv->as_mv.col > mb_to_right_edge || |
| 69 mv->as_mv.row < mb_to_top_edge || | 69 mv->as_mv.row < mb_to_top_edge || |
| 70 mv->as_mv.row > mb_to_bottom_edge; | 70 mv->as_mv.row > mb_to_bottom_edge; |
| 71 } | 71 } |
| 72 | 72 |
| 73 vp9_prob *vp9_mv_ref_probs(VP9_COMMON *pc, | |
| 74 vp9_prob p[VP9_INTER_MODES - 1], | |
| 75 int context); | |
| 76 | |
| 77 void vp9_append_sub8x8_mvs_for_idx(VP9_COMMON *pc, | 73 void vp9_append_sub8x8_mvs_for_idx(VP9_COMMON *pc, |
| 78 MACROBLOCKD *xd, | 74 MACROBLOCKD *xd, |
| 79 int_mv *dst_nearest, | 75 int_mv *dst_nearest, |
| 80 int_mv *dst_near, | 76 int_mv *dst_near, |
| 81 int block_idx, int ref_idx); | 77 int block_idx, int ref_idx); |
| 82 | 78 |
| 83 static MB_PREDICTION_MODE left_block_mode(const MODE_INFO *cur_mb, int b) { | 79 static MB_PREDICTION_MODE left_block_mode(const MODE_INFO *cur_mb, int b) { |
| 84 // FIXME(rbultje, jingning): temporary hack because jenkins doesn't | 80 // FIXME(rbultje, jingning): temporary hack because jenkins doesn't |
| 85 // understand this condition. This will go away soon. | 81 // understand this condition. This will go away soon. |
| 86 if (b == 0 || b == 2) { | 82 if (b == 0 || b == 2) { |
| (...skipping 24 matching lines...) Expand all Loading... |
| 111 return ((cur_mb->bmi + 2 + b)->as_mode.first); | 107 return ((cur_mb->bmi + 2 + b)->as_mode.first); |
| 112 } else { | 108 } else { |
| 113 return cur_mb->mbmi.mode; | 109 return cur_mb->mbmi.mode; |
| 114 } | 110 } |
| 115 } | 111 } |
| 116 | 112 |
| 117 return (cur_mb->bmi + b - 2)->as_mode.first; | 113 return (cur_mb->bmi + b - 2)->as_mode.first; |
| 118 } | 114 } |
| 119 | 115 |
| 120 #endif // VP9_COMMON_VP9_FINDNEARMV_H_ | 116 #endif // VP9_COMMON_VP9_FINDNEARMV_H_ |
| OLD | NEW |