diff options
Diffstat (limited to 'vp8')
| -rw-r--r-- | vp8/common/arm/systemdependent.c | 2 | ||||
| -rw-r--r-- | vp8/common/generic/systemdependent.c | 2 | ||||
| -rw-r--r-- | vp8/vp8_common.mk | 2 | ||||
| -rw-r--r-- | vp8/vp8_cx_iface.c | 8 | ||||
| -rw-r--r-- | vp8/vp8cx.mk | 2 |
5 files changed, 13 insertions, 3 deletions
diff --git a/vp8/common/arm/systemdependent.c b/vp8/common/arm/systemdependent.c index b58cd789f..6e8651754 100644 --- a/vp8/common/arm/systemdependent.c +++ b/vp8/common/arm/systemdependent.c @@ -126,11 +126,13 @@ void vp8_machine_specific_config(VP8_COMMON *ctx) rtcd->loopfilter.simple_b_h = vp8_loop_filter_bhs_c; #endif +#if CONFIG_POSTPROC || (CONFIG_VP8_ENCODER && CONFIG_PSNR) rtcd->postproc.down = vp8_mbpost_proc_down_c; rtcd->postproc.across = vp8_mbpost_proc_across_ip_c; rtcd->postproc.downacross = vp8_post_proc_down_and_across_c; rtcd->postproc.addnoise = vp8_plane_add_noise_c; #endif +#endif #if HAVE_ARMV7 vp8_build_intra_predictors_mby_ptr = vp8_build_intra_predictors_mby_neon; diff --git a/vp8/common/generic/systemdependent.c b/vp8/common/generic/systemdependent.c index 2fbeaee4c..91077b3cf 100644 --- a/vp8/common/generic/systemdependent.c +++ b/vp8/common/generic/systemdependent.c @@ -61,7 +61,7 @@ void vp8_machine_specific_config(VP8_COMMON *ctx) rtcd->loopfilter.simple_mb_h = vp8_loop_filter_mbhs_c; rtcd->loopfilter.simple_b_h = vp8_loop_filter_bhs_c; -#if CONFIG_POSTPROC || CONFIG_VP8_ENCODER +#if CONFIG_POSTPROC || (CONFIG_VP8_ENCODER && CONFIG_PSNR) rtcd->postproc.down = vp8_mbpost_proc_down_c; rtcd->postproc.across = vp8_mbpost_proc_across_ip_c; rtcd->postproc.downacross = vp8_post_proc_down_and_across_c; diff --git a/vp8/vp8_common.mk b/vp8/vp8_common.mk index 3aad7b7be..481bca435 100644 --- a/vp8/vp8_common.mk +++ b/vp8/vp8_common.mk @@ -96,8 +96,6 @@ VP8_COMMON_SRCS-$(ARCH_X86)$(ARCH_X86_64) += common/x86/vp8_asm_stubs.c VP8_COMMON_SRCS-$(ARCH_X86)$(ARCH_X86_64) += common/x86/loopfilter_x86.c VP8_COMMON_SRCS-$(CONFIG_POSTPROC) += common/postproc.h VP8_COMMON_SRCS-$(CONFIG_POSTPROC) += common/postproc.c -VP8_COMMON_SRCS-$(CONFIG_VP8_ENCODER) += common/postproc.h -VP8_COMMON_SRCS-$(CONFIG_VP8_ENCODER) += common/postproc.c VP8_COMMON_SRCS-$(HAVE_MMX) += common/x86/idctllm_mmx.asm VP8_COMMON_SRCS-$(HAVE_MMX) += common/x86/iwalsh_mmx.asm VP8_COMMON_SRCS-$(HAVE_MMX) += common/x86/recon_mmx.asm diff --git a/vp8/vp8_cx_iface.c b/vp8/vp8_cx_iface.c index 3cc84fc76..da74a4fc8 100644 --- a/vp8/vp8_cx_iface.c +++ b/vp8/vp8_cx_iface.c @@ -826,7 +826,9 @@ static vpx_codec_err_t vp8e_set_previewpp(vpx_codec_alg_priv_t *ctx, int ctr_id, va_list args) { +#if CONFIG_POSTPROC vp8_postproc_cfg_t *data = va_arg(args, vp8_postproc_cfg_t *); + (void)ctr_id; if (data) { @@ -835,6 +837,12 @@ static vpx_codec_err_t vp8e_set_previewpp(vpx_codec_alg_priv_t *ctx, } else return VPX_CODEC_INVALID_PARAM; +#else + (void)ctx; + (void)ctr_id; + (void)args; + return VPX_CODEC_INCAPABLE; +#endif } diff --git a/vp8/vp8cx.mk b/vp8/vp8cx.mk index 50eb29731..cafd06554 100644 --- a/vp8/vp8cx.mk +++ b/vp8/vp8cx.mk @@ -80,6 +80,8 @@ VP8_CX_SRCS-$(CONFIG_PSNR) += encoder/ssim.c VP8_CX_SRCS-yes += encoder/tokenize.c VP8_CX_SRCS-yes += encoder/treewriter.c VP8_CX_SRCS-yes += encoder/variance_c.c +VP8_CX_SRCS-$(CONFIG_PSNR) += common/postproc.h +VP8_CX_SRCS-$(CONFIG_PSNR) += common/postproc.c ifeq ($(CONFIG_REALTIME_ONLY),yes) VP8_CX_SRCS_REMOVE-yes += encoder/firstpass.c |