From 08b8b6bb8f09b616c2e8c910c181d34fbf6b0970 Mon Sep 17 00:00:00 2001 From: James Zern Date: Mon, 19 Sep 2016 19:01:21 -0700 Subject: examples: quiet -Wshorten-64-to-32 warnings all around usage of strtol/strtoul Change-Id: If907c89f107a068987aa71ddd93cee9a7389e4cd --- examples/decode_with_drops.c | 4 ++-- examples/set_maps.c | 4 ++-- examples/simple_encoder.c | 10 +++++----- examples/twopass_encoder.c | 6 +++--- examples/vp8cx_set_ref.c | 4 ++-- examples/vp9_lossless_encoder.c | 4 ++-- examples/vp9cx_set_ref.c | 4 ++-- examples/vpx_temporal_svc_encoder.c | 16 ++++++++-------- 8 files changed, 26 insertions(+), 26 deletions(-) (limited to 'examples') diff --git a/examples/decode_with_drops.c b/examples/decode_with_drops.c index 29b8be941..e69e2a9f9 100644 --- a/examples/decode_with_drops.c +++ b/examples/decode_with_drops.c @@ -92,8 +92,8 @@ int main(int argc, char **argv) { if (!(outfile = fopen(argv[2], "wb"))) die("Failed to open %s for writing.", argv[2]); - n = strtol(argv[3], &nptr, 0); - m = strtol(nptr + 1, NULL, 0); + n = (int)strtol(argv[3], &nptr, 0); + m = (int)strtol(nptr + 1, NULL, 0); is_range = (*nptr == '-'); if (!n || !m || (*nptr != '-' && *nptr != '/')) die("Couldn't parse pattern %s.\n", argv[3]); diff --git a/examples/set_maps.c b/examples/set_maps.c index d128e7d9a..c0c7d10e7 100644 --- a/examples/set_maps.c +++ b/examples/set_maps.c @@ -174,8 +174,8 @@ int main(int argc, char **argv) { } assert(encoder != NULL); info.codec_fourcc = encoder->fourcc; - info.frame_width = strtol(argv[2], NULL, 0); - info.frame_height = strtol(argv[3], NULL, 0); + info.frame_width = (int)strtol(argv[2], NULL, 0); + info.frame_height = (int)strtol(argv[3], NULL, 0); info.time_base.numerator = 1; info.time_base.denominator = fps; diff --git a/examples/simple_encoder.c b/examples/simple_encoder.c index 8632f179b..dde6344f8 100644 --- a/examples/simple_encoder.c +++ b/examples/simple_encoder.c @@ -175,14 +175,14 @@ int main(int argc, char **argv) { infile_arg = argv[4]; outfile_arg = argv[5]; keyframe_interval_arg = argv[6]; - max_frames = strtol(argv[8], NULL, 0); + max_frames = (int)strtol(argv[8], NULL, 0); encoder = get_vpx_encoder_by_name(codec_arg); if (!encoder) die("Unsupported codec."); info.codec_fourcc = encoder->fourcc; - info.frame_width = strtol(width_arg, NULL, 0); - info.frame_height = strtol(height_arg, NULL, 0); + info.frame_width = (int)strtol(width_arg, NULL, 0); + info.frame_height = (int)strtol(height_arg, NULL, 0); info.time_base.numerator = 1; info.time_base.denominator = fps; @@ -196,7 +196,7 @@ int main(int argc, char **argv) { die("Failed to allocate image."); } - keyframe_interval = strtol(keyframe_interval_arg, NULL, 0); + keyframe_interval = (int)strtol(keyframe_interval_arg, NULL, 0); if (keyframe_interval < 0) die("Invalid keyframe interval value."); printf("Using %s\n", vpx_codec_iface_name(encoder->codec_interface())); @@ -209,7 +209,7 @@ int main(int argc, char **argv) { cfg.g_timebase.num = info.time_base.numerator; cfg.g_timebase.den = info.time_base.denominator; cfg.rc_target_bitrate = bitrate; - cfg.g_error_resilient = strtol(argv[7], NULL, 0); + cfg.g_error_resilient = (vpx_codec_er_flags_t)strtoul(argv[7], NULL, 0); writer = vpx_video_writer_open(outfile_arg, kContainerIVF, &info); if (!writer) die("Failed to open %s for writing.", outfile_arg); diff --git a/examples/twopass_encoder.c b/examples/twopass_encoder.c index 4c130ec18..4e63a7a6c 100644 --- a/examples/twopass_encoder.c +++ b/examples/twopass_encoder.c @@ -209,13 +209,13 @@ int main(int argc, char **argv) { if (argc != 7) die("Invalid number of arguments."); - max_frames = strtol(argv[6], NULL, 0); + max_frames = (int)strtol(argv[6], NULL, 0); encoder = get_vpx_encoder_by_name(codec_arg); if (!encoder) die("Unsupported codec."); - w = strtol(width_arg, NULL, 0); - h = strtol(height_arg, NULL, 0); + w = (int)strtol(width_arg, NULL, 0); + h = (int)strtol(height_arg, NULL, 0); if (w <= 0 || h <= 0 || (w % 2) != 0 || (h % 2) != 0) die("Invalid frame size: %dx%d", w, h); diff --git a/examples/vp8cx_set_ref.c b/examples/vp8cx_set_ref.c index fc7bdab39..846477c61 100644 --- a/examples/vp8cx_set_ref.c +++ b/examples/vp8cx_set_ref.c @@ -122,8 +122,8 @@ int main(int argc, char **argv) { if (!update_frame_num) die("Couldn't parse frame number '%s'\n", argv[5]); info.codec_fourcc = encoder->fourcc; - info.frame_width = strtol(argv[1], NULL, 0); - info.frame_height = strtol(argv[2], NULL, 0); + info.frame_width = (int)strtol(argv[1], NULL, 0); + info.frame_height = (int)strtol(argv[2], NULL, 0); info.time_base.numerator = 1; info.time_base.denominator = fps; diff --git a/examples/vp9_lossless_encoder.c b/examples/vp9_lossless_encoder.c index 5802186bf..cb5ca6bfe 100644 --- a/examples/vp9_lossless_encoder.c +++ b/examples/vp9_lossless_encoder.c @@ -78,8 +78,8 @@ int main(int argc, char **argv) { if (!encoder) die("Unsupported codec."); info.codec_fourcc = encoder->fourcc; - info.frame_width = strtol(argv[1], NULL, 0); - info.frame_height = strtol(argv[2], NULL, 0); + info.frame_width = (int)strtol(argv[1], NULL, 0); + info.frame_height = (int)strtol(argv[2], NULL, 0); info.time_base.numerator = 1; info.time_base.denominator = fps; diff --git a/examples/vp9cx_set_ref.c b/examples/vp9cx_set_ref.c index e0bb795f7..798d7e3f2 100644 --- a/examples/vp9cx_set_ref.c +++ b/examples/vp9cx_set_ref.c @@ -335,8 +335,8 @@ int main(int argc, char **argv) { } info.codec_fourcc = encoder->fourcc; - info.frame_width = strtol(width_arg, NULL, 0); - info.frame_height = strtol(height_arg, NULL, 0); + info.frame_width = (int)strtol(width_arg, NULL, 0); + info.frame_height = (int)strtol(height_arg, NULL, 0); info.time_base.numerator = 1; info.time_base.denominator = fps; diff --git a/examples/vpx_temporal_svc_encoder.c b/examples/vpx_temporal_svc_encoder.c index 4a3387787..309a2fe2e 100644 --- a/examples/vpx_temporal_svc_encoder.c +++ b/examples/vpx_temporal_svc_encoder.c @@ -547,13 +547,13 @@ int main(int argc, char **argv) { printf("Using %s\n", vpx_codec_iface_name(encoder->codec_interface())); - width = strtol(argv[4], NULL, 0); - height = strtol(argv[5], NULL, 0); + width = (unsigned int)strtoul(argv[4], NULL, 0); + height = (unsigned int)strtoul(argv[5], NULL, 0); if (width < 16 || width % 2 || height < 16 || height % 2) { die("Invalid resolution: %d x %d", width, height); } - layering_mode = strtol(argv[10], NULL, 0); + layering_mode = (int)strtol(argv[10], NULL, 0); if (layering_mode < 0 || layering_mode > 13) { die("Invalid layering mode (0..12) %s", argv[10]); } @@ -609,17 +609,17 @@ int main(int argc, char **argv) { #endif // CONFIG_VP9_HIGHBITDEPTH // Timebase format e.g. 30fps: numerator=1, demoninator = 30. - cfg.g_timebase.num = strtol(argv[6], NULL, 0); - cfg.g_timebase.den = strtol(argv[7], NULL, 0); + cfg.g_timebase.num = (int)strtol(argv[6], NULL, 0); + cfg.g_timebase.den = (int)strtol(argv[7], NULL, 0); - speed = strtol(argv[8], NULL, 0); + speed = (int)strtol(argv[8], NULL, 0); if (speed < 0) { die("Invalid speed setting: must be positive"); } for (i = min_args_base; (int)i < min_args_base + mode_to_num_layers[layering_mode]; ++i) { - rc.layer_target_bitrate[i - 11] = strtol(argv[i], NULL, 0); + rc.layer_target_bitrate[i - 11] = (int)strtol(argv[i], NULL, 0); if (strncmp(encoder->name, "vp8", 3) == 0) cfg.ts_target_bitrate[i - 11] = rc.layer_target_bitrate[i - 11]; else if (strncmp(encoder->name, "vp9", 3) == 0) @@ -627,7 +627,7 @@ int main(int argc, char **argv) { } // Real time parameters. - cfg.rc_dropframe_thresh = strtol(argv[9], NULL, 0); + cfg.rc_dropframe_thresh = (unsigned int)strtoul(argv[9], NULL, 0); cfg.rc_end_usage = VPX_CBR; cfg.rc_min_quantizer = 2; cfg.rc_max_quantizer = 56; -- cgit v1.2.3