ref: f2378498627e3c4c76a18a32842ff1826b68a949
parent: 73de6ad522fcd465fe378e1b4d4cb369faee5901
parent: 5c337fd08a6ffcaaf87edeb84d7c5e7c1f04206c
author: James Zern <jzern@google.com>
date: Tue May 12 15:02:05 EDT 2015
Merge changes from topic 'missing-proto' * changes: vpxenc: make some functions static vpxdec: make some functions static tools_common.h: fix get_vpx_decoder_count() proto tools_common.h: fix get_vpx_encoder_count() proto tools_common.h: fix usage_exit() prototype
--- a/examples/decode_to_md5.c
+++ b/examples/decode_to_md5.c
@@ -71,7 +71,7 @@
static const char *exec_name;
-void usage_exit() {+void usage_exit(void) {fprintf(stderr, "Usage: %s <infile> <outfile>\n", exec_name);
exit(EXIT_FAILURE);
}
--- a/examples/decode_with_drops.c
+++ b/examples/decode_with_drops.c
@@ -65,7 +65,7 @@
static const char *exec_name;
-void usage_exit() {+void usage_exit(void) {fprintf(stderr, "Usage: %s <infile> <outfile> <N-M|N/M>\n", exec_name);
exit(EXIT_FAILURE);
}
--- a/examples/postproc.c
+++ b/examples/postproc.c
@@ -52,7 +52,7 @@
static const char *exec_name;
-void usage_exit() {+void usage_exit(void) {fprintf(stderr, "Usage: %s <infile> <outfile>\n", exec_name);
exit(EXIT_FAILURE);
}
--- a/examples/resize_util.c
+++ b/examples/resize_util.c
@@ -15,6 +15,7 @@
#include <stdlib.h>
#include <string.h>
+#include "../tools_common.h"
#include "../vp9/encoder/vp9_resize.h"
static const char *exec_name = NULL;
@@ -26,7 +27,7 @@
printf("<output_yuv> [<frames>]\n");}
-void usage_exit() {+void usage_exit(void) {usage();
exit(EXIT_FAILURE);
}
--- a/examples/set_maps.c
+++ b/examples/set_maps.c
@@ -55,7 +55,7 @@
static const char *exec_name;
-void usage_exit() {+void usage_exit(void) {fprintf(stderr, "Usage: %s <codec> <width> <height> <infile> <outfile>\n",
exec_name);
exit(EXIT_FAILURE);
--- a/examples/simple_decoder.c
+++ b/examples/simple_decoder.c
@@ -88,7 +88,7 @@
static const char *exec_name;
-void usage_exit() {+void usage_exit(void) {fprintf(stderr, "Usage: %s <infile> <outfile>\n", exec_name);
exit(EXIT_FAILURE);
}
--- a/examples/simple_encoder.c
+++ b/examples/simple_encoder.c
@@ -106,7 +106,7 @@
static const char *exec_name;
-void usage_exit() {+void usage_exit(void) {fprintf(stderr,
"Usage: %s <codec> <width> <height> <infile> <outfile> "
"<keyframe-interval> [<error-resilient>]\nSee comments in "
--- a/examples/twopass_encoder.c
+++ b/examples/twopass_encoder.c
@@ -58,7 +58,7 @@
static const char *exec_name;
-void usage_exit() {+void usage_exit(void) {fprintf(stderr, "Usage: %s <codec> <width> <height> <infile> <outfile>\n",
exec_name);
exit(EXIT_FAILURE);
--- a/examples/vp8_multi_resolution_encoder.c
+++ b/examples/vp8_multi_resolution_encoder.c
@@ -40,11 +40,11 @@
#include "vpx/vpx_encoder.h"
#include "vpx/vp8cx.h"
#include "vpx_ports/mem_ops.h"
-#include "./tools_common.h"
+#include "../tools_common.h"
#define interface (vpx_codec_vp8_cx())
#define fourcc 0x30385056
-void usage_exit() {+void usage_exit(void) {exit(EXIT_FAILURE);
}
--- a/examples/vp8cx_set_ref.c
+++ b/examples/vp8cx_set_ref.c
@@ -58,7 +58,7 @@
static const char *exec_name;
-void usage_exit() {+void usage_exit(void) {fprintf(stderr, "Usage: %s <width> <height> <infile> <outfile> <frame>\n",
exec_name);
exit(EXIT_FAILURE);
--- a/examples/vp9_lossless_encoder.c
+++ b/examples/vp9_lossless_encoder.c
@@ -20,7 +20,7 @@
static const char *exec_name;
-void usage_exit() {+void usage_exit(void) {fprintf(stderr, "vp9_lossless_encoder: Example demonstrating VP9 lossless "
"encoding feature. Supports raw input only.\n");
fprintf(stderr, "Usage: %s <width> <height> <infile> <outfile>\n", exec_name);
--- a/examples/vp9_spatial_svc_encoder.c
+++ b/examples/vp9_spatial_svc_encoder.c
@@ -116,7 +116,7 @@
static const char *exec_name;
-void usage_exit() {+void usage_exit(void) {fprintf(stderr, "Usage: %s <options> input_filename output_filename\n",
exec_name);
fprintf(stderr, "Options:\n");
--- a/examples/vpx_temporal_svc_encoder.c
+++ b/examples/vpx_temporal_svc_encoder.c
@@ -28,7 +28,7 @@
static const char *exec_name;
-void usage_exit() {+void usage_exit(void) {exit(EXIT_FAILURE);
}
--- a/tools_common.c
+++ b/tools_common.c
@@ -140,7 +140,7 @@
#endif
};
-int get_vpx_encoder_count() {+int get_vpx_encoder_count(void) {return sizeof(vpx_encoders) / sizeof(vpx_encoders[0]);
}
@@ -170,7 +170,7 @@
#endif
};
-int get_vpx_decoder_count() {+int get_vpx_decoder_count(void) {return sizeof(vpx_decoders) / sizeof(vpx_decoders[0]);
}
--- a/tools_common.h
+++ b/tools_common.h
@@ -119,7 +119,7 @@
void die_codec(vpx_codec_ctx_t *ctx, const char *s) VPX_NO_RETURN;
/* The tool including this file must define usage_exit() */
-void usage_exit() VPX_NO_RETURN;
+void usage_exit(void) VPX_NO_RETURN;
#undef VPX_NO_RETURN
@@ -131,11 +131,11 @@
vpx_codec_iface_t *(*const codec_interface)();
} VpxInterface;
-int get_vpx_encoder_count();
+int get_vpx_encoder_count(void);
const VpxInterface *get_vpx_encoder_by_index(int i);
const VpxInterface *get_vpx_encoder_by_name(const char *name);
-int get_vpx_decoder_count();
+int get_vpx_decoder_count(void);
const VpxInterface *get_vpx_decoder_by_index(int i);
const VpxInterface *get_vpx_decoder_by_name(const char *name);
const VpxInterface *get_vpx_decoder_by_fourcc(uint32_t fourcc);
--- a/vpxdec.c
+++ b/vpxdec.c
@@ -169,7 +169,7 @@
}
#endif
-void usage_exit() {+void usage_exit(void) {int i;
fprintf(stderr, "Usage: %s <options> filename\n\n"
@@ -312,7 +312,7 @@
}
}
-int file_is_raw(struct VpxInputContext *input) {+static int file_is_raw(struct VpxInputContext *input) {uint8_t buf[32];
int is_raw = 0;
vpx_codec_stream_info_t si;
@@ -343,7 +343,7 @@
return is_raw;
}
-void show_progress(int frame_in, int frame_out, uint64_t dx_time) {+static void show_progress(int frame_in, int frame_out, uint64_t dx_time) {fprintf(stderr,
"%d decoded frames/%d showed frames in %"PRId64" us (%.2f fps)\r",
frame_in, frame_out, dx_time,
@@ -365,8 +365,8 @@
// Application private data passed into the set function. |min_size| is the
// minimum size in bytes needed to decode the next frame. |fb| pointer to the
// frame buffer.
-int get_vp9_frame_buffer(void *cb_priv, size_t min_size,
- vpx_codec_frame_buffer_t *fb) {+static int get_vp9_frame_buffer(void *cb_priv, size_t min_size,
+ vpx_codec_frame_buffer_t *fb) {int i;
struct ExternalFrameBufferList *const ext_fb_list =
(struct ExternalFrameBufferList *)cb_priv;
@@ -403,8 +403,8 @@
// Callback used by libvpx when there are no references to the frame buffer.
// |cb_priv| user private data passed into the set function. |fb| pointer
// to the frame buffer.
-int release_vp9_frame_buffer(void *cb_priv,
- vpx_codec_frame_buffer_t *fb) {+static int release_vp9_frame_buffer(void *cb_priv,
+ vpx_codec_frame_buffer_t *fb) {struct ExternalFrameBuffer *const ext_fb =
(struct ExternalFrameBuffer *)fb->priv;
(void)cb_priv;
@@ -412,9 +412,9 @@
return 0;
}
-void generate_filename(const char *pattern, char *out, size_t q_len,
- unsigned int d_w, unsigned int d_h,
- unsigned int frame_in) {+static void generate_filename(const char *pattern, char *out, size_t q_len,
+ unsigned int d_w, unsigned int d_h,
+ unsigned int frame_in) {const char *p = pattern;
char *q = out;
@@ -536,7 +536,7 @@
}
#endif
-int main_loop(int argc, const char **argv_) {+static int main_loop(int argc, const char **argv_) {vpx_codec_ctx_t decoder;
char *fn = NULL;
int i;
--- a/vpxenc.c
+++ b/vpxenc.c
@@ -99,7 +99,7 @@
va_end(ap);
}
-int read_frame(struct VpxInputContext *input_ctx, vpx_image_t *img) {+static int read_frame(struct VpxInputContext *input_ctx, vpx_image_t *img) {FILE *f = input_ctx->file;
y4m_input *y4m = &input_ctx->y4m;
int shortread = 0;
@@ -114,7 +114,7 @@
return !shortread;
}
-int file_is_y4m(const char detect[4]) {+static int file_is_y4m(const char detect[4]) { if (memcmp(detect, "YUV4", 4) == 0) {return 1;
}
@@ -121,7 +121,7 @@
return 0;
}
-int fourcc_is_ivf(const char detect[4]) {+static int fourcc_is_ivf(const char detect[4]) { if (memcmp(detect, "DKIF", 4) == 0) {return 1;
}
@@ -467,7 +467,7 @@
static const arg_def_t *no_args[] = { NULL };-void usage_exit() {+void usage_exit(void) {int i;
fprintf(stderr, "Usage: %s <options> -o dst_filename src_filename \n",
@@ -793,8 +793,8 @@
};
-void validate_positive_rational(const char *msg,
- struct vpx_rational *rat) {+static void validate_positive_rational(const char *msg,
+ struct vpx_rational *rat) { if (rat->den < 0) {rat->num *= -1;
rat->den *= -1;
@@ -919,7 +919,7 @@
}
-void open_input_file(struct VpxInputContext *input) {+static void open_input_file(struct VpxInputContext *input) {/* Parse certain options from the input file, if possible */
input->file = strcmp(input->filename, "-")
? fopen(input->filename, "rb") : set_binary_mode(stdin);