| 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 15 matching lines...) Expand all  Loading... | 
| 26 | 26 | 
| 27 typedef enum | 27 typedef enum | 
| 28 { | 28 { | 
| 29     SUBMVREF_NORMAL, | 29     SUBMVREF_NORMAL, | 
| 30     SUBMVREF_LEFT_ZED, | 30     SUBMVREF_LEFT_ZED, | 
| 31     SUBMVREF_ABOVE_ZED, | 31     SUBMVREF_ABOVE_ZED, | 
| 32     SUBMVREF_LEFT_ABOVE_SAME, | 32     SUBMVREF_LEFT_ABOVE_SAME, | 
| 33     SUBMVREF_LEFT_ABOVE_ZED | 33     SUBMVREF_LEFT_ABOVE_ZED | 
| 34 } sumvfref_t; | 34 } sumvfref_t; | 
| 35 | 35 | 
| 36 int vp8_mv_cont(const MV *l, const MV *a) | 36 int vp8_mv_cont(const int_mv *l, const int_mv *a) | 
| 37 { | 37 { | 
| 38     int lez = (l->row == 0 && l->col == 0); | 38     int lez = (l->as_int == 0); | 
| 39     int aez = (a->row == 0 && a->col == 0); | 39     int aez = (a->as_int == 0); | 
| 40     int lea = (l->row == a->row && l->col == a->col); | 40     int lea = (l->as_int == a->as_int); | 
| 41 | 41 | 
| 42     if (lea && lez) | 42     if (lea && lez) | 
| 43         return SUBMVREF_LEFT_ABOVE_ZED; | 43         return SUBMVREF_LEFT_ABOVE_ZED; | 
| 44 | 44 | 
| 45     if (lea) | 45     if (lea) | 
| 46         return SUBMVREF_LEFT_ABOVE_SAME; | 46         return SUBMVREF_LEFT_ABOVE_SAME; | 
| 47 | 47 | 
| 48     if (aez) | 48     if (aez) | 
| 49         return SUBMVREF_ABOVE_ZED; | 49         return SUBMVREF_ABOVE_ZED; | 
| 50 | 50 | 
| (...skipping 213 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 264     vp8_tokens_from_tree(vp8_uv_mode_encodings,  vp8_uv_mode_tree); | 264     vp8_tokens_from_tree(vp8_uv_mode_encodings,  vp8_uv_mode_tree); | 
| 265     vp8_tokens_from_tree(vp8_mbsplit_encodings, vp8_mbsplit_tree); | 265     vp8_tokens_from_tree(vp8_mbsplit_encodings, vp8_mbsplit_tree); | 
| 266 | 266 | 
| 267     vp8_tokens_from_tree_offset(vp8_mv_ref_encoding_array, | 267     vp8_tokens_from_tree_offset(vp8_mv_ref_encoding_array, | 
| 268                                 vp8_mv_ref_tree, NEARESTMV); | 268                                 vp8_mv_ref_tree, NEARESTMV); | 
| 269     vp8_tokens_from_tree_offset(vp8_sub_mv_ref_encoding_array, | 269     vp8_tokens_from_tree_offset(vp8_sub_mv_ref_encoding_array, | 
| 270                                 vp8_sub_mv_ref_tree, LEFT4X4); | 270                                 vp8_sub_mv_ref_tree, LEFT4X4); | 
| 271 | 271 | 
| 272     vp8_tokens_from_tree(vp8_small_mvencodings, vp8_small_mvtree); | 272     vp8_tokens_from_tree(vp8_small_mvencodings, vp8_small_mvtree); | 
| 273 } | 273 } | 
| OLD | NEW | 
|---|