summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--vp8/common/alloccommon.c1
-rw-r--r--vp8/common/copy_c.c4
-rw-r--r--vp8/common/filter.c1
-rw-r--r--vp8/common/generic/systemdependent.c1
-rw-r--r--vp8/common/idctllm.c1
-rw-r--r--vp8/common/postproc.c4
-rw-r--r--vp8/common/rtcd_defs.pl2
-rw-r--r--vp8/common/variance.h2
-rw-r--r--vp8/common/variance_c.c3
-rw-r--r--vp8/common/x86/variance_mmx.c1
-rw-r--r--vp8/common/x86/variance_sse2.c1
-rw-r--r--vp8/common/x86/variance_ssse3.c1
-rw-r--r--vp8/decoder/onyxd_if.c2
-rw-r--r--vp8/encoder/dct.c2
-rw-r--r--vp8/encoder/ethreading.c2
-rw-r--r--vp8/encoder/firstpass.c4
-rw-r--r--vp8/encoder/modecosts.c1
-rw-r--r--vp8/encoder/modecosts.h4
-rw-r--r--vp8/encoder/onyx_int.h5
-rw-r--r--vp8/encoder/pickinter.c4
-rw-r--r--vp8/encoder/rdopt.h3
-rw-r--r--vp8/vp8_cx_iface.c2
22 files changed, 30 insertions, 21 deletions
diff --git a/vp8/common/alloccommon.c b/vp8/common/alloccommon.c
index b9d875a2f..8dfd4ce20 100644
--- a/vp8/common/alloccommon.c
+++ b/vp8/common/alloccommon.c
@@ -10,6 +10,7 @@
#include "vpx_config.h"
+#include "alloccommon.h"
#include "blockd.h"
#include "vpx_mem/vpx_mem.h"
#include "onyxc_int.h"
diff --git a/vp8/common/copy_c.c b/vp8/common/copy_c.c
index fd96c8634..e3392913f 100644
--- a/vp8/common/copy_c.c
+++ b/vp8/common/copy_c.c
@@ -11,11 +11,11 @@
#include <string.h>
-#include "vpx_config.h"
+#include "./vp8_rtcd.h"
#include "vpx/vpx_integer.h"
/* Copy 2 macroblocks to a buffer */
-void vp8_copy32xn_c(unsigned char *src_ptr, int src_stride,
+void vp8_copy32xn_c(const unsigned char *src_ptr, int src_stride,
unsigned char *dst_ptr, int dst_stride,
int height)
{
diff --git a/vp8/common/filter.c b/vp8/common/filter.c
index 25266f868..84c608eff 100644
--- a/vp8/common/filter.c
+++ b/vp8/common/filter.c
@@ -10,6 +10,7 @@
#include "filter.h"
+#include "./vp8_rtcd.h"
DECLARE_ALIGNED(16, const short, vp8_bilinear_filters[8][2]) =
{
diff --git a/vp8/common/generic/systemdependent.c b/vp8/common/generic/systemdependent.c
index d84df3348..4393ced48 100644
--- a/vp8/common/generic/systemdependent.c
+++ b/vp8/common/generic/systemdependent.c
@@ -17,6 +17,7 @@
#include "vpx_ports/x86.h"
#endif
#include "vp8/common/onyxc_int.h"
+#include "vp8/common/systemdependent.h"
#if CONFIG_MULTITHREAD
#if HAVE_UNISTD_H && !defined(__OS2__)
diff --git a/vp8/common/idctllm.c b/vp8/common/idctllm.c
index 47af52f04..f5403c5aa 100644
--- a/vp8/common/idctllm.c
+++ b/vp8/common/idctllm.c
@@ -8,6 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
+#include "./vp8_rtcd.h"
/****************************************************************************
* Notes:
diff --git a/vp8/common/postproc.c b/vp8/common/postproc.c
index 266431a32..a4e6ae170 100644
--- a/vp8/common/postproc.c
+++ b/vp8/common/postproc.c
@@ -427,7 +427,7 @@ void vp8_de_noise(VP8_COMMON *cm,
}
}
-double vp8_gaussian(double sigma, double mu, double x)
+static double gaussian(double sigma, double mu, double x)
{
return 1 / (sigma * sqrt(2.0 * 3.14159265)) *
(exp(-(x - mu) * (x - mu) / (2 * sigma * sigma)));
@@ -455,7 +455,7 @@ static void fillrd(struct postproc_state *state, int q, int a)
for (i = -32; i < 32; i++)
{
- const int v = (int)(.5 + 256 * vp8_gaussian(sigma, 0, i));
+ const int v = (int)(.5 + 256 * gaussian(sigma, 0, i));
if (v)
{
diff --git a/vp8/common/rtcd_defs.pl b/vp8/common/rtcd_defs.pl
index 56b7db7ec..c9f14d58a 100644
--- a/vp8/common/rtcd_defs.pl
+++ b/vp8/common/rtcd_defs.pl
@@ -333,7 +333,7 @@ specialize qw/vp8_get4x4sse_cs mmx neon/;
# Block copy
#
if ($opts{arch} =~ /x86/) {
- add_proto qw/void vp8_copy32xn/, "const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int ref_stride, int n";
+ add_proto qw/void vp8_copy32xn/, "const unsigned char *src_ptr, int source_stride, unsigned char *dst_ptr, int dst_stride, int n";
specialize qw/vp8_copy32xn sse2 sse3/;
}
diff --git a/vp8/common/variance.h b/vp8/common/variance.h
index 552a28025..b62cc6136 100644
--- a/vp8/common/variance.h
+++ b/vp8/common/variance.h
@@ -29,7 +29,7 @@ typedef unsigned int(*vpx_sad_fn_t)(
typedef void (*vp8_copy32xn_fn_t)(
const unsigned char *src_ptr,
int source_stride,
- const unsigned char *ref_ptr,
+ unsigned char *ref_ptr,
int ref_stride,
int n);
diff --git a/vp8/common/variance_c.c b/vp8/common/variance_c.c
index 773b655ef..dc95bfeb3 100644
--- a/vp8/common/variance_c.c
+++ b/vp8/common/variance_c.c
@@ -9,8 +9,9 @@
*/
-#include "variance.h"
+#include "./vp8_rtcd.h"
#include "filter.h"
+#include "variance.h"
unsigned int vp8_get_mb_ss_c
diff --git a/vp8/common/x86/variance_mmx.c b/vp8/common/x86/variance_mmx.c
index 02e02420f..10a58b822 100644
--- a/vp8/common/x86/variance_mmx.c
+++ b/vp8/common/x86/variance_mmx.c
@@ -8,6 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
+#include "./vp8_rtcd.h"
#include "vpx_config.h"
#include "vp8/common/variance.h"
#include "vpx_ports/mem.h"
diff --git a/vp8/common/x86/variance_sse2.c b/vp8/common/x86/variance_sse2.c
index 1fe127bf2..6c6539d8e 100644
--- a/vp8/common/x86/variance_sse2.c
+++ b/vp8/common/x86/variance_sse2.c
@@ -8,6 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
+#include "./vp8_rtcd.h"
#include "vpx_config.h"
#include "vp8/common/variance.h"
#include "vpx_ports/mem.h"
diff --git a/vp8/common/x86/variance_ssse3.c b/vp8/common/x86/variance_ssse3.c
index 73eb90df6..d8c8da540 100644
--- a/vp8/common/x86/variance_ssse3.c
+++ b/vp8/common/x86/variance_ssse3.c
@@ -8,6 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
+#include "./vp8_rtcd.h"
#include "vpx_config.h"
#include "vp8/common/variance.h"
#include "vpx_ports/mem.h"
diff --git a/vp8/decoder/onyxd_if.c b/vp8/decoder/onyxd_if.c
index d7b8c76dc..9015fcbb4 100644
--- a/vp8/decoder/onyxd_if.c
+++ b/vp8/decoder/onyxd_if.c
@@ -259,7 +259,7 @@ static int swap_frame_buffers (VP8_COMMON *cm)
return err;
}
-int check_fragments_for_errors(VP8D_COMP *pbi)
+static int check_fragments_for_errors(VP8D_COMP *pbi)
{
if (!pbi->ec_active &&
pbi->fragments.count <= 1 && pbi->fragments.sizes[0] == 0)
diff --git a/vp8/encoder/dct.c b/vp8/encoder/dct.c
index 091554a5d..0c7198d5d 100644
--- a/vp8/encoder/dct.c
+++ b/vp8/encoder/dct.c
@@ -11,6 +11,8 @@
#include <math.h>
+#include "./vp8_rtcd.h"
+
void vp8_short_fdct4x4_c(short *input, short *output, int pitch)
{
int i;
diff --git a/vp8/encoder/ethreading.c b/vp8/encoder/ethreading.c
index 977b0b032..4e234ccd5 100644
--- a/vp8/encoder/ethreading.c
+++ b/vp8/encoder/ethreading.c
@@ -19,8 +19,6 @@
extern void vp8cx_mb_init_quantizer(VP8_COMP *cpi, MACROBLOCK *x, int ok_to_skip);
-extern void vp8_loopfilter_frame(VP8_COMP *cpi, VP8_COMMON *cm);
-
static THREAD_FUNCTION thread_loopfilter(void *p_data)
{
VP8_COMP *cpi = (VP8_COMP *)(((LPFTHREAD_DATA *)p_data)->ptr1);
diff --git a/vp8/encoder/firstpass.c b/vp8/encoder/firstpass.c
index 75c136261..a6ff0e7a0 100644
--- a/vp8/encoder/firstpass.c
+++ b/vp8/encoder/firstpass.c
@@ -34,8 +34,6 @@
/* #define OUTPUT_FPF 1 */
extern void vp8cx_frame_init_quantizer(VP8_COMP *cpi);
-extern void vp8_set_mbmode_and_mvs(MACROBLOCK *x, MB_PREDICTION_MODE mb, int_mv *mv);
-extern void vp8_alloc_compressor_data(VP8_COMP *cpi);
#define GFQ_ADJUSTMENT vp8_gf_boost_qadjustment[Q]
extern int vp8_kf_boost_qadjustment[QINDEX_RANGE];
@@ -1329,8 +1327,6 @@ static int estimate_kf_group_q(VP8_COMP *cpi, double section_err, int section_ta
return Q;
}
-extern void vp8_new_framerate(VP8_COMP *cpi, double framerate);
-
void vp8_init_second_pass(VP8_COMP *cpi)
{
FIRSTPASS_STATS this_frame;
diff --git a/vp8/encoder/modecosts.c b/vp8/encoder/modecosts.c
index c61563c56..ad0e9308d 100644
--- a/vp8/encoder/modecosts.c
+++ b/vp8/encoder/modecosts.c
@@ -10,6 +10,7 @@
#include "vp8/common/blockd.h"
+#include "modecosts.h"
#include "onyx_int.h"
#include "treewriter.h"
#include "vp8/common/entropymode.h"
diff --git a/vp8/encoder/modecosts.h b/vp8/encoder/modecosts.h
index 9281551c8..9871bfffd 100644
--- a/vp8/encoder/modecosts.h
+++ b/vp8/encoder/modecosts.h
@@ -16,7 +16,9 @@
extern "C" {
#endif
-void vp8_init_mode_costs(VP8_COMP *x);
+struct VP8_COMP;
+
+void vp8_init_mode_costs(struct VP8_COMP *x);
#ifdef __cplusplus
} // extern "C"
diff --git a/vp8/encoder/onyx_int.h b/vp8/encoder/onyx_int.h
index 82d745390..846c15b46 100644
--- a/vp8/encoder/onyx_int.h
+++ b/vp8/encoder/onyx_int.h
@@ -714,6 +714,11 @@ typedef struct VP8_COMP
} rd_costs;
} VP8_COMP;
+void vp8_alloc_compressor_data(VP8_COMP *cpi);
+int vp8_reverse_trans(int x);
+void vp8_new_framerate(VP8_COMP *cpi, double framerate);
+void vp8_loopfilter_frame(VP8_COMP *cpi, VP8_COMMON *cm);
+
void vp8_pack_bitstream(VP8_COMP *cpi, unsigned char *dest,
unsigned char *dest_end, unsigned long *size);
diff --git a/vp8/encoder/pickinter.c b/vp8/encoder/pickinter.c
index c4c0e7e9e..98ea5a040 100644
--- a/vp8/encoder/pickinter.c
+++ b/vp8/encoder/pickinter.c
@@ -29,8 +29,6 @@
#include "denoising.h"
#endif
-extern int VP8_UVSSE(MACROBLOCK *x);
-
#ifdef SPEEDSTATS
extern unsigned int cnt_pm;
#endif
@@ -38,8 +36,6 @@ extern unsigned int cnt_pm;
extern const int vp8_ref_frame_order[MAX_MODES];
extern const MB_PREDICTION_MODE vp8_mode_order[MAX_MODES];
-extern int vp8_cost_mv_ref(MB_PREDICTION_MODE m, const int near_mv_ref_ct[4]);
-
// Fixed point implementation of a skin color classifier. Skin color
// is model by a Gaussian distribution in the CbCr color space.
// See ../../test/skin_color_detector_test.cc where the reference
diff --git a/vp8/encoder/rdopt.h b/vp8/encoder/rdopt.h
index e0da35e20..b4fcd10b6 100644
--- a/vp8/encoder/rdopt.h
+++ b/vp8/encoder/rdopt.h
@@ -136,6 +136,9 @@ extern void vp8_mv_pred
int near_sadidx[]
);
void vp8_cal_sad(VP8_COMP *cpi, MACROBLOCKD *xd, MACROBLOCK *x, int recon_yoffset, int near_sadidx[]);
+int VP8_UVSSE(MACROBLOCK *x);
+int vp8_cost_mv_ref(MB_PREDICTION_MODE m, const int near_mv_ref_ct[4]);
+void vp8_set_mbmode_and_mvs(MACROBLOCK *x, MB_PREDICTION_MODE mb, int_mv *mv);
#ifdef __cplusplus
} // extern "C"
diff --git a/vp8/vp8_cx_iface.c b/vp8/vp8_cx_iface.c
index af9cc7320..db4c52887 100644
--- a/vp8/vp8_cx_iface.c
+++ b/vp8/vp8_cx_iface.c
@@ -478,8 +478,6 @@ static vpx_codec_err_t vp8e_set_config(vpx_codec_alg_priv_t *ctx,
return res;
}
-int vp8_reverse_trans(int);
-
static vpx_codec_err_t get_quantizer(vpx_codec_alg_priv_t *ctx, va_list args)
{
int *const arg = va_arg(args, int *);
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-10 13:26:30 +0000