| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (c) 2011 The WebM project authors. All Rights Reserved. | 2 * Copyright (c) 2011 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 <assert.h> |
| 12 |
| 11 #include "error_concealment.h" | 13 #include "error_concealment.h" |
| 12 #include "onyxd_int.h" | 14 #include "onyxd_int.h" |
| 13 #include "decodemv.h" | 15 #include "decodemv.h" |
| 14 #include "vpx_mem/vpx_mem.h" | 16 #include "vpx_mem/vpx_mem.h" |
| 15 #include "vp8/common/findnearmv.h" | 17 #include "vp8/common/findnearmv.h" |
| 16 | 18 |
| 17 #include <assert.h> | |
| 18 | |
| 19 #define MIN(x,y) (((x)<(y))?(x):(y)) | 19 #define MIN(x,y) (((x)<(y))?(x):(y)) |
| 20 #define MAX(x,y) (((x)>(y))?(x):(y)) | 20 #define MAX(x,y) (((x)>(y))?(x):(y)) |
| 21 | 21 |
| 22 #define FLOOR(x,q) ((x) & -(1 << (q))) | 22 #define FLOOR(x,q) ((x) & -(1 << (q))) |
| 23 | 23 |
| 24 #define NUM_NEIGHBORS 20 | 24 #define NUM_NEIGHBORS 20 |
| 25 | 25 |
| 26 typedef struct ec_position | 26 typedef struct ec_position |
| 27 { | 27 { |
| 28 int row; | 28 int row; |
| (...skipping 560 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 589 | 589 |
| 590 void vp8_conceal_corrupt_mb(MACROBLOCKD *xd) | 590 void vp8_conceal_corrupt_mb(MACROBLOCKD *xd) |
| 591 { | 591 { |
| 592 /* This macroblock has corrupt residual, use the motion compensated | 592 /* This macroblock has corrupt residual, use the motion compensated |
| 593 image (predictor) for concealment */ | 593 image (predictor) for concealment */ |
| 594 | 594 |
| 595 /* The build predictor functions now output directly into the dst buffer, | 595 /* The build predictor functions now output directly into the dst buffer, |
| 596 * so the copies are no longer necessary */ | 596 * so the copies are no longer necessary */ |
| 597 | 597 |
| 598 } | 598 } |
| OLD | NEW |