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 #include <limits.h> | 11 #include <limits.h> |
12 #include <math.h> | 12 #include <math.h> |
13 #include <stdio.h> | 13 #include <stdio.h> |
14 | 14 |
15 #include "./vpx_config.h" | 15 #include "./vpx_config.h" |
16 #include "./vpx_dsp_rtcd.h" | 16 #include "./vpx_dsp_rtcd.h" |
17 | 17 |
| 18 #include "vpx_dsp/vpx_dsp_common.h" |
18 #include "vpx_mem/vpx_mem.h" | 19 #include "vpx_mem/vpx_mem.h" |
19 #include "vpx_ports/mem.h" | 20 #include "vpx_ports/mem.h" |
20 | 21 |
21 #include "vp9/common/vp9_common.h" | 22 #include "vp9/common/vp9_common.h" |
22 #include "vp9/common/vp9_reconinter.h" | 23 #include "vp9/common/vp9_reconinter.h" |
23 | 24 |
24 #include "vp9/encoder/vp9_encoder.h" | 25 #include "vp9/encoder/vp9_encoder.h" |
25 #include "vp9/encoder/vp9_mcomp.h" | 26 #include "vp9/encoder/vp9_mcomp.h" |
26 | 27 |
27 // #define NEW_DIAMOND_SEARCH | 28 // #define NEW_DIAMOND_SEARCH |
(...skipping 2345 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2373 break; | 2374 break; |
2374 default: | 2375 default: |
2375 assert(0 && "Invalid search method."); | 2376 assert(0 && "Invalid search method."); |
2376 } | 2377 } |
2377 | 2378 |
2378 if (method != NSTEP && rd && var < var_max) | 2379 if (method != NSTEP && rd && var < var_max) |
2379 var = vp9_get_mvpred_var(x, tmp_mv, ref_mv, fn_ptr, 1); | 2380 var = vp9_get_mvpred_var(x, tmp_mv, ref_mv, fn_ptr, 1); |
2380 | 2381 |
2381 return var; | 2382 return var; |
2382 } | 2383 } |
OLD | NEW |