From d5d6a609d0fdec6f142a9f0489893edd93e57f08 Mon Sep 17 00:00:00 2001 From: James Zern Date: Fri, 16 Jun 2017 01:45:11 -0700 Subject: [PATCH] vp8,bitstream.h: add missing prototypes quiets -Wmissing:prototypes Change-Id: I835a80eddca2b16280780e18558c321df3272c43 --- vp8/encoder/bitstream.h | 8 ++++++++ vp8/encoder/encodeframe.c | 4 +--- vp8/encoder/onyx_if.c | 4 +--- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/vp8/encoder/bitstream.h b/vp8/encoder/bitstream.h index 2b196dc..ed45bff 100644 --- a/vp8/encoder/bitstream.h +++ b/vp8/encoder/bitstream.h @@ -15,7 +15,15 @@ extern "C" { #endif +#include "vp8/encoder/treewriter.h" +#include "vp8/encoder/tokenize.h" + void vp8_pack_tokens(vp8_writer *w, const TOKENEXTRA *p, int xcount); +void vp8_convert_rfct_to_prob(struct VP8_COMP *const cpi); +void vp8_calc_ref_frame_costs(int *ref_frame_cost, int prob_intra, + int prob_last, int prob_garf); +int vp8_estimate_entropy_savings(struct VP8_COMP *cpi); +void vp8_update_coef_probs(struct VP8_COMP *cpi); #ifdef __cplusplus } // extern "C" diff --git a/vp8/encoder/encodeframe.c b/vp8/encoder/encodeframe.c index c7ad3bf..cf569da 100644 --- a/vp8/encoder/encodeframe.c +++ b/vp8/encoder/encodeframe.c @@ -11,6 +11,7 @@ #include "vpx_config.h" #include "vp8_rtcd.h" #include "./vpx_dsp_rtcd.h" +#include "bitstream.h" #include "encodemb.h" #include "encodemv.h" #include "vp8/common/common.h" @@ -35,9 +36,6 @@ #include "encodeframe.h" extern void vp8_stuff_mb(VP8_COMP *cpi, MACROBLOCK *x, TOKENEXTRA **t); -extern void vp8_calc_ref_frame_costs(int *ref_frame_cost, int prob_intra, - int prob_last, int prob_garf); -extern void vp8_convert_rfct_to_prob(VP8_COMP *const cpi); extern void vp8cx_initialize_me_consts(VP8_COMP *cpi, int QIndex); extern void vp8_auto_select_speed(VP8_COMP *cpi); extern void vp8cx_init_mbrthread_data(VP8_COMP *cpi, MACROBLOCK *x, diff --git a/vp8/encoder/onyx_if.c b/vp8/encoder/onyx_if.c index 66d441f..a1aa382 100644 --- a/vp8/encoder/onyx_if.c +++ b/vp8/encoder/onyx_if.c @@ -12,6 +12,7 @@ #include "./vpx_scale_rtcd.h" #include "./vpx_dsp_rtcd.h" #include "./vp8_rtcd.h" +#include "bitstream.h" #include "vp8/common/onyxc_int.h" #include "vp8/common/blockd.h" #include "onyx_int.h" @@ -51,7 +52,6 @@ #if CONFIG_REALTIME_ONLY & CONFIG_ONTHEFLY_BITPACKING extern int vp8_update_coef_context(VP8_COMP *cpi); -extern void vp8_update_coef_probs(VP8_COMP *cpi); #endif extern void vp8cx_pick_filter_level_fast(YV12_BUFFER_CONFIG *sd, VP8_COMP *cpi); @@ -67,8 +67,6 @@ extern void print_tree_update_probs(); extern int vp8cx_create_encoder_threads(VP8_COMP *cpi); extern void vp8cx_remove_encoder_threads(VP8_COMP *cpi); -int vp8_estimate_entropy_savings(VP8_COMP *cpi); - int vp8_calc_ss_err(YV12_BUFFER_CONFIG *source, YV12_BUFFER_CONFIG *dest); extern void vp8_temporal_filter_prepare_c(VP8_COMP *cpi, int distance); -- 2.7.4