diff options
author | Johann <johannkoenig@google.com> | 2019-01-07 16:18:31 -0800 |
---|---|---|
committer | Johann <johannkoenig@google.com> | 2019-01-07 16:21:06 -0800 |
commit | f485c67d0f1d6a5e26b8c9663486039572ba38d9 (patch) | |
tree | 8a8679249e3d3cbe595d368bd693b9823f09d75a /vp9 | |
parent | 3476e407188ed0b1dd1897aa424fc18f1e9fd464 (diff) | |
download | libvpx-f485c67d0f1d6a5e26b8c9663486039572ba38d9.tar libvpx-f485c67d0f1d6a5e26b8c9663486039572ba38d9.tar.gz libvpx-f485c67d0f1d6a5e26b8c9663486039572ba38d9.tar.bz2 libvpx-f485c67d0f1d6a5e26b8c9663486039572ba38d9.zip |
vp9_get_blockiness: resolve missing declaration
BUG=webm:1584
Change-Id: I719c64734f4eae07def2d700006834a2420891a7
Diffstat (limited to 'vp9')
-rw-r--r-- | vp9/encoder/vp9_blockiness.c | 1 | ||||
-rw-r--r-- | vp9/encoder/vp9_blockiness.h | 26 | ||||
-rw-r--r-- | vp9/encoder/vp9_encoder.c | 7 | ||||
-rw-r--r-- | vp9/vp9cx.mk | 1 |
4 files changed, 31 insertions, 4 deletions
diff --git a/vp9/encoder/vp9_blockiness.c b/vp9/encoder/vp9_blockiness.c index 9ab57b57c..da68a3c3c 100644 --- a/vp9/encoder/vp9_blockiness.c +++ b/vp9/encoder/vp9_blockiness.c @@ -11,6 +11,7 @@ #include "vpx/vpx_integer.h" #include "vpx_ports/system_state.h" +#include "vp9/encoder/vp9_blockiness.h" static int horizontal_filter(const uint8_t *s) { return (s[1] - s[-2]) * 2 + (s[-1] - s[0]) * 6; diff --git a/vp9/encoder/vp9_blockiness.h b/vp9/encoder/vp9_blockiness.h new file mode 100644 index 000000000..e840cb251 --- /dev/null +++ b/vp9/encoder/vp9_blockiness.h @@ -0,0 +1,26 @@ +/* + * Copyright (c) 2019 The WebM project authors. All Rights Reserved. + * + * Use of this source code is governed by a BSD-style license + * that can be found in the LICENSE file in the root of the source + * tree. An additional intellectual property rights grant can be found + * in the file PATENTS. All contributing project authors may + * be found in the AUTHORS file in the root of the source tree. + */ + +#ifndef VPX_VP9_ENCODER_VP9_BLOCKINESS_H_ +#define VPX_VP9_ENCODER_VP9_BLOCKINESS_H_ + +#ifdef __cplusplus +extern "C" { +#endif + +double vp9_get_blockiness(const uint8_t *img1, int img1_pitch, + const uint8_t *img2, int img2_pitch, int width, + int height); + +#ifdef __cplusplus +} // extern "C" +#endif + +#endif // VPX_VP9_ENCODER_VP9_BLOCKINESS_H_ diff --git a/vp9/encoder/vp9_encoder.c b/vp9/encoder/vp9_encoder.c index fb0cc23e5..bf35b3570 100644 --- a/vp9/encoder/vp9_encoder.c +++ b/vp9/encoder/vp9_encoder.c @@ -43,6 +43,9 @@ #include "vp9/encoder/vp9_aq_cyclicrefresh.h" #include "vp9/encoder/vp9_aq_variance.h" #include "vp9/encoder/vp9_bitstream.h" +#if CONFIG_INTERNAL_STATS +#include "vp9/encoder/vp9_blockiness.h" +#endif #include "vp9/encoder/vp9_context_tree.h" #include "vp9/encoder/vp9_encodeframe.h" #include "vp9/encoder/vp9_encodemb.h" @@ -5162,10 +5165,6 @@ static void check_src_altref(VP9_COMP *cpi, } #if CONFIG_INTERNAL_STATS -extern double vp9_get_blockiness(const uint8_t *img1, int img1_pitch, - const uint8_t *img2, int img2_pitch, int width, - int height); - static void adjust_image_stat(double y, double u, double v, double all, ImageStat *s) { s->stat[Y] += y; diff --git a/vp9/vp9cx.mk b/vp9/vp9cx.mk index f5a76dcbf..05981d689 100644 --- a/vp9/vp9cx.mk +++ b/vp9/vp9cx.mk @@ -75,6 +75,7 @@ VP9_CX_SRCS-yes += encoder/vp9_svc_layercontext.c VP9_CX_SRCS-yes += encoder/vp9_resize.c VP9_CX_SRCS-yes += encoder/vp9_resize.h VP9_CX_SRCS-$(CONFIG_INTERNAL_STATS) += encoder/vp9_blockiness.c +VP9_CX_SRCS-$(CONFIG_INTERNAL_STATS) += encoder/vp9_blockiness.h VP9_CX_SRCS-yes += encoder/vp9_tokenize.c VP9_CX_SRCS-yes += encoder/vp9_treewriter.c |