shithub: libvpx

Info  •  Files  •  Log  •  Branches

vp8,encodeframe.h: correct prototypes

+ add missing include
quiets -Wmissing-prototypes

Change-Id: I64af0368ba3d7f1d4de22a5887b631bb2cf15b8a

--- a/vp8/encoder/encodeframe.c

+++ b/vp8/encoder/encodeframe.c

@@ -39,8 +39,6 @@

 #include "encodeframe.h"

 extern void vp8_stuff_mb(VP8_COMP *cpi, MACROBLOCK *x, TOKENEXTRA **t);

-extern void vp8cx_initialize_me_consts(VP8_COMP *cpi, int QIndex);

-extern void vp8_auto_select_speed(VP8_COMP *cpi);

 static void adjust_act_zbin(VP8_COMP *cpi, MACROBLOCK *x);

 #ifdef MODE_STATS

--- a/vp8/encoder/encodeframe.h

+++ b/vp8/encoder/encodeframe.h

@@ -10,24 +10,29 @@

 #ifndef VP8_ENCODER_ENCODEFRAME_H_

 #define VP8_ENCODER_ENCODEFRAME_H_

+#include "vp8/encoder/tokenize.h"

+

 #ifdef __cplusplus

 extern "C" {

 #endif

-extern void vp8_activity_masking(VP8_COMP *cpi, MACROBLOCK *x);

-extern void vp8_build_block_offsets(MACROBLOCK *x);

+struct VP8_COMP;

+struct macroblock;

-extern void vp8_setup_block_ptrs(MACROBLOCK *x);

+void vp8_activity_masking(struct VP8_COMP *cpi, MACROBLOCK *x);

-extern void vp8_encode_frame(VP8_COMP *cpi);

+void vp8_build_block_offsets(struct macroblock *x);

-extern int vp8cx_encode_inter_macroblock(VP8_COMP *cpi, MACROBLOCK *x,

-                                         TOKENEXTRA **t, int recon_yoffset,

-                                         int recon_uvoffset, int mb_row,

-                                         int mb_col);

+void vp8_setup_block_ptrs(struct macroblock *x);

-extern int vp8cx_encode_intra_macroblock(VP8_COMP *cpi, MACROBLOCK *x,

-                                         TOKENEXTRA **t);

+void vp8_encode_frame(struct VP8_COMP *cpi);

+

+int vp8cx_encode_inter_macroblock(struct VP8_COMP *cpi, struct macroblock *x,

+                                  TOKENEXTRA **t, int recon_yoffset,

+                                  int recon_uvoffset, int mb_row, int mb_col);

+

+int vp8cx_encode_intra_macroblock(struct VP8_COMP *cpi, struct macroblock *x,

+                                  TOKENEXTRA **t);

 #ifdef __cplusplus

 }  // extern "C"

 #endif

--- a/vp8/encoder/rdopt.c

+++ b/vp8/encoder/rdopt.c

@@ -16,6 +16,7 @@

 #include "vpx_config.h"

 #include "vp8_rtcd.h"

 #include "./vpx_dsp_rtcd.h"

+#include "encodeframe.h"

 #include "tokenize.h"

 #include "treewriter.h"

 #include "onyx_int.h"

--- a/vp8/encoder/rdopt.h

+++ b/vp8/encoder/rdopt.h

@@ -19,6 +19,9 @@

 #define RDCOST(RM, DM, R, D) (((128 + (R) * (RM)) >> 8) + (DM) * (D))

+void vp8cx_initialize_me_consts(VP8_COMP *cpi, int QIndex);

+void vp8_auto_select_speed(VP8_COMP *cpi);

+

 static INLINE void insertsortmv(int arr[], int len) {

   int i, j, k;