Unified · Split
| @@ -19,7 +19,9 @@ · 18 unmodified lines | |||
| 19 | #include "entropy.h" | 19 | #include "entropy.h" |
| 20 | #include "idct.h" | 20 | #include "idct.h" |
| 21 | #include "recon.h" | 21 | #include "recon.h" |
| 22 | #if CONFIG_POSTPROC | ||
| 22 | #include "postproc.h" | 23 | #include "postproc.h" |
| 24 | #endif | ||
| 23 | 25 | ||
| 24 | /*#ifdef PACKET_TESTING*/ | 26 | /*#ifdef PACKET_TESTING*/ |
| 25 | #include "header.h" | 27 | #include "header.h" |
| @@ -75,7 +77,9 @@ typedef struct VP8_COMMON_RTCD · 49 unmodified lines | |||
| 75 | vp8_recon_rtcd_vtable_t recon; | 77 | vp8_recon_rtcd_vtable_t recon; |
| 76 | vp8_subpix_rtcd_vtable_t subpix; | 78 | vp8_subpix_rtcd_vtable_t subpix; |
| 77 | vp8_loopfilter_rtcd_vtable_t loopfilter; | 79 | vp8_loopfilter_rtcd_vtable_t loopfilter; |
| 80 | #if CONFIG_POSTPROC | ||
| 78 | vp8_postproc_rtcd_vtable_t postproc; | 81 | vp8_postproc_rtcd_vtable_t postproc; |
| 82 | #endif | ||
| 79 | int flags; | 83 | int flags; |
| 80 | #else | 84 | #else |
| 81 | int unused; | 85 | int unused; |
| @@ -201,7 +205,9 @@ typedef struct VP8Common · 119 unmodified lines | |||
| 201 | #if CONFIG_MULTITHREAD | 205 | #if CONFIG_MULTITHREAD |
| 202 | int processor_core_count; | 206 | int processor_core_count; |
| 203 | #endif | 207 | #endif |
| 208 | #if CONFIG_POSTPROC | ||
| 204 | struct postproc_state postproc_state; | 209 | struct postproc_state postproc_state; |
| 210 | #endif | ||
| 205 | } VP8_COMMON; | 211 | } VP8_COMMON; |
| 206 | 212 | ||
| 207 | #endif | 213 | #endif |
| @@ -13,7 +13,6 @@ · 12 unmodified lines | |||
| 13 | #include "vpx_ports/arm.h" | 13 | #include "vpx_ports/arm.h" |
| 14 | #include "vp8/common/blockd.h" | 14 | #include "vp8/common/blockd.h" |
| 15 | #include "vp8/common/pragmas.h" | 15 | #include "vp8/common/pragmas.h" |
| 16 | #include "vp8/common/postproc.h" | ||
| 17 | #include "vp8/decoder/dequantize.h" | 16 | #include "vp8/decoder/dequantize.h" |
| 18 | #include "vp8/decoder/onyxd_int.h" | 17 | #include "vp8/decoder/onyxd_int.h" |
| 19 | 18 | ||
| @@ -9,6 +9,7 @@ · 8 unmodified lines | |||
| 9 | */ | 9 | */ |
| 10 | 10 | ||
| 11 | 11 | ||
| 12 | #include "vpx_config.h" | ||
| 12 | #include "vp8/common/onyxc_int.h" | 13 | #include "vp8/common/onyxc_int.h" |
| 13 | #include "onyx_int.h" | 14 | #include "onyx_int.h" |
| 14 | #include "vp8/common/systemdependent.h" | 15 | #include "vp8/common/systemdependent.h" |
| @@ -24,7 +25,9 @@ · 9 unmodified lines | |||
| 24 | #include "segmentation.h" | 25 | #include "segmentation.h" |
| 25 | #include "vp8/common/g_common.h" | 26 | #include "vp8/common/g_common.h" |
| 26 | #include "vpx_scale/yv12extend.h" | 27 | #include "vpx_scale/yv12extend.h" |
| 28 | #if CONFIG_POSTPROC | ||
| 27 | #include "vp8/common/postproc.h" | 29 | #include "vp8/common/postproc.h" |
| 30 | #endif | ||
| 28 | #include "vpx_mem/vpx_mem.h" | 31 | #include "vpx_mem/vpx_mem.h" |
| 29 | #include "vp8/common/swapyv12buffer.h" | 32 | #include "vp8/common/swapyv12buffer.h" |
| 30 | #include "vp8/common/threading.h" | 33 | #include "vp8/common/threading.h" |
| @@ -24,7 +24,6 @@ · 23 unmodified lines | |||
| 24 | #include "segmentation.h" | 24 | #include "segmentation.h" |
| 25 | #include "vp8/common/g_common.h" | 25 | #include "vp8/common/g_common.h" |
| 26 | #include "vpx_scale/yv12extend.h" | 26 | #include "vpx_scale/yv12extend.h" |
| 27 | #include "vp8/common/postproc.h" | ||
| 28 | #include "vpx_mem/vpx_mem.h" | 27 | #include "vpx_mem/vpx_mem.h" |
| 29 | #include "vp8/common/swapyv12buffer.h" | 28 | #include "vp8/common/swapyv12buffer.h" |
| 30 | #include "vp8/common/threading.h" | 29 | #include "vp8/common/threading.h" |