Add the aom_tools_ prefix to our warn() function
Add the aom_tools_ prefix to the warn() function in
common/tools_common.h.
It turns out that glibc also has a warn() function with the same
prototype. So on Linux systems that use glibc, it is impossible to
detect unresolved references to our warn() function in the libaom shared
library. Renaming our warn() function allows us to detect this error on
glibc systems.
BUG=aomedia:3139
Change-Id: I4a0da9b2ba211c2b0a8fdb5a57cd5aa13009d830
diff --git a/apps/aomdec.c b/apps/aomdec.c
index b1929a6..341c5bc 100644
--- a/apps/aomdec.c
+++ b/apps/aomdec.c
@@ -187,20 +187,22 @@
size_t frame_size = 0;
if (fread(raw_hdr, RAW_FRAME_HDR_SZ, 1, infile) != 1) {
- if (!feof(infile)) warn("Failed to read RAW frame size\n");
+ if (!feof(infile)) aom_tools_warn("Failed to read RAW frame size\n");
} else {
const size_t kCorruptFrameThreshold = 256 * 1024 * 1024;
const size_t kFrameTooSmallThreshold = 256 * 1024;
frame_size = mem_get_le32(raw_hdr);
if (frame_size > kCorruptFrameThreshold) {
- warn("Read invalid frame size (%u)\n", (unsigned int)frame_size);
+ aom_tools_warn("Read invalid frame size (%u)\n",
+ (unsigned int)frame_size);
frame_size = 0;
}
if (frame_size < kFrameTooSmallThreshold) {
- warn("Warning: Read invalid frame size (%u) - not a raw file?\n",
- (unsigned int)frame_size);
+ aom_tools_warn(
+ "Warning: Read invalid frame size (%u) - not a raw file?\n",
+ (unsigned int)frame_size);
}
if (frame_size > *buffer_size) {
@@ -209,7 +211,7 @@
*buffer = new_buf;
*buffer_size = 2 * frame_size;
} else {
- warn("Failed to allocate compressed data buffer\n");
+ aom_tools_warn("Failed to allocate compressed data buffer\n");
frame_size = 0;
}
}
@@ -217,7 +219,7 @@
if (!feof(infile)) {
if (fread(*buffer, 1, frame_size, infile) != frame_size) {
- warn("Failed to read full frame\n");
+ aom_tools_warn("Failed to read full frame\n");
return 1;
}
*bytes_read = frame_size;
@@ -671,8 +673,8 @@
fatal("Unsupported fourcc: %x\n", aom_input_ctx.fourcc);
if (interface && fourcc_interface && interface != fourcc_interface)
- warn("Header indicates codec: %s\n",
- aom_codec_iface_name(fourcc_interface));
+ aom_tools_warn("Header indicates codec: %s\n",
+ aom_codec_iface_name(fourcc_interface));
else
interface = fourcc_interface;
@@ -760,10 +762,10 @@
if (aom_codec_decode(&decoder, buf, bytes_in_buffer, NULL)) {
const char *detail = aom_codec_error_detail(&decoder);
- warn("Failed to decode frame %d: %s", frame_in,
- aom_codec_error(&decoder));
+ aom_tools_warn("Failed to decode frame %d: %s", frame_in,
+ aom_codec_error(&decoder));
- if (detail) warn("Additional information: %s", detail);
+ if (detail) aom_tools_warn("Additional information: %s", detail);
if (!keep_going) goto fail;
}
@@ -771,8 +773,8 @@
int qp;
if (AOM_CODEC_CONTROL_TYPECHECKED(&decoder, AOMD_GET_LAST_QUANTIZER,
&qp)) {
- warn("Failed AOMD_GET_LAST_QUANTIZER: %s",
- aom_codec_error(&decoder));
+ aom_tools_warn("Failed AOMD_GET_LAST_QUANTIZER: %s",
+ aom_codec_error(&decoder));
if (!keep_going) goto fail;
}
fprintf(framestats_file, "%d,%d\r\n", (int)bytes_in_buffer, qp);
@@ -792,7 +794,8 @@
if (flush_decoder) {
// Flush the decoder.
if (aom_codec_decode(&decoder, NULL, 0, NULL)) {
- warn("Failed to flush decoder: %s", aom_codec_error(&decoder));
+ aom_tools_warn("Failed to flush decoder: %s",
+ aom_codec_error(&decoder));
}
}
@@ -806,7 +809,8 @@
if (AOM_CODEC_CONTROL_TYPECHECKED(&decoder, AOMD_GET_FRAME_CORRUPTED,
&corrupted)) {
- warn("Failed AOM_GET_FRAME_CORRUPTED: %s", aom_codec_error(&decoder));
+ aom_tools_warn("Failed AOM_GET_FRAME_CORRUPTED: %s",
+ aom_codec_error(&decoder));
if (!keep_going) goto fail;
}
frames_corrupted += corrupted;
diff --git a/apps/aomenc.c b/apps/aomenc.c
index d7f7d72..afc519d 100644
--- a/apps/aomenc.c
+++ b/apps/aomenc.c
@@ -680,8 +680,8 @@
if (global->pass) {
/* DWIM: Assume the user meant passes=2 if pass=2 is specified */
if (global->pass > global->passes) {
- warn("Assuming --pass=%d implies --passes=%d\n", global->pass,
- global->pass);
+ aom_tools_warn("Assuming --pass=%d implies --passes=%d\n", global->pass,
+ global->pass);
global->passes = global->pass;
}
}
@@ -702,14 +702,14 @@
}
if (global->usage == AOM_USAGE_REALTIME && global->passes > 1) {
- warn("Enforcing one-pass encoding in realtime mode\n");
+ aom_tools_warn("Enforcing one-pass encoding in realtime mode\n");
if (global->pass > 1)
die("Error: Invalid --pass=%d for one-pass encoding\n", global->pass);
global->passes = 1;
}
if (global->usage == AOM_USAGE_ALL_INTRA && global->passes > 1) {
- warn("Enforcing one-pass encoding in all intra mode\n");
+ aom_tools_warn("Enforcing one-pass encoding in all intra mode\n");
global->passes = 1;
}
}
@@ -858,7 +858,8 @@
config->arg_ctrls[j][1] = arg_parse_enum_or_int(arg);
if (key == AOME_SET_ENABLEAUTOALTREF && config->arg_ctrls[j][1] > 1) {
- warn("auto-alt-ref > 1 is deprecated... setting auto-alt-ref=1\n");
+ aom_tools_warn(
+ "auto-alt-ref > 1 is deprecated... setting auto-alt-ref=1\n");
config->arg_ctrls[j][1] = 1;
}
@@ -894,7 +895,8 @@
if (strcmp(name, g_av1_codec_arg_defs.auto_altref.long_name) == 0) {
int auto_altref = arg_parse_int(arg);
if (auto_altref > 1) {
- warn("auto-alt-ref > 1 is deprecated... setting auto-alt-ref=1\n");
+ aom_tools_warn(
+ "auto-alt-ref > 1 is deprecated... setting auto-alt-ref=1\n");
config->arg_key_vals[j][1] = "1";
}
}
@@ -1018,7 +1020,8 @@
argi)) {
config->use_16bit_internal = CONFIG_AV1_HIGHBITDEPTH;
if (!config->use_16bit_internal) {
- warn("%s option ignored with CONFIG_AV1_HIGHBITDEPTH=0.\n", arg.name);
+ aom_tools_warn("%s option ignored with CONFIG_AV1_HIGHBITDEPTH=0.\n",
+ arg.name);
}
} else if (arg_match(&arg, &g_av1_codec_arg_defs.dropframe_thresh, argi)) {
config->cfg.rc_dropframe_thresh = arg_parse_uint(&arg);
@@ -1064,17 +1067,17 @@
} else if (arg_match(&arg, &g_av1_codec_arg_defs.bias_pct, argi)) {
config->cfg.rc_2pass_vbr_bias_pct = arg_parse_uint(&arg);
if (global->passes < 2)
- warn("option %s ignored in one-pass mode.\n", arg.name);
+ aom_tools_warn("option %s ignored in one-pass mode.\n", arg.name);
} else if (arg_match(&arg, &g_av1_codec_arg_defs.minsection_pct, argi)) {
config->cfg.rc_2pass_vbr_minsection_pct = arg_parse_uint(&arg);
if (global->passes < 2)
- warn("option %s ignored in one-pass mode.\n", arg.name);
+ aom_tools_warn("option %s ignored in one-pass mode.\n", arg.name);
} else if (arg_match(&arg, &g_av1_codec_arg_defs.maxsection_pct, argi)) {
config->cfg.rc_2pass_vbr_maxsection_pct = arg_parse_uint(&arg);
if (global->passes < 2)
- warn("option %s ignored in one-pass mode.\n", arg.name);
+ aom_tools_warn("option %s ignored in one-pass mode.\n", arg.name);
} else if (arg_match(&arg, &g_av1_codec_arg_defs.fwd_kf_enabled, argi)) {
config->cfg.fwd_kf_enabled = arg_parse_uint(&arg);
} else if (arg_match(&arg, &g_av1_codec_arg_defs.kf_min_dist, argi)) {
@@ -1123,7 +1126,8 @@
arg_match(&arg, &g_av1_codec_arg_defs.enable_restoration,
argi)) {
if (arg_parse_uint(&arg) == 1) {
- warn("non-zero %s option ignored in realtime mode.\n", arg.name);
+ aom_tools_warn("non-zero %s option ignored in realtime mode.\n",
+ arg.name);
}
} else if (arg_match(&arg, &g_av1_codec_arg_defs.two_pass_input, argi)) {
config->two_pass_input = arg.val;
@@ -1161,17 +1165,18 @@
config->use_16bit_internal |= config->cfg.g_bit_depth > AOM_BITS_8;
if (global->usage == AOM_USAGE_REALTIME && config->cfg.g_lag_in_frames != 0) {
- warn("non-zero lag-in-frames option ignored in realtime mode.\n");
+ aom_tools_warn("non-zero lag-in-frames option ignored in realtime mode.\n");
config->cfg.g_lag_in_frames = 0;
}
if (global->usage == AOM_USAGE_ALL_INTRA) {
if (config->cfg.g_lag_in_frames != 0) {
- warn("non-zero lag-in-frames option ignored in all intra mode.\n");
+ aom_tools_warn(
+ "non-zero lag-in-frames option ignored in all intra mode.\n");
config->cfg.g_lag_in_frames = 0;
}
if (config->cfg.kf_max_dist != 0) {
- warn(
+ aom_tools_warn(
"non-zero max key frame distance option ignored in all intra "
"mode.\n");
config->cfg.kf_max_dist = 0;
@@ -2292,7 +2297,7 @@
if (stream->config.write_webm) {
stream->config.write_webm = 0;
stream->config.write_ivf = 0;
- warn("aomenc compiled w/o WebM support. Writing OBU stream.");
+ aom_tools_warn("aomenc compiled w/o WebM support. Writing OBU stream.");
}
}
#endif
diff --git a/common/tools_common.c b/common/tools_common.c
index 2b199a5..280d49a 100644
--- a/common/tools_common.c
+++ b/common/tools_common.c
@@ -66,7 +66,7 @@
exit(EXIT_FAILURE);
}
-void warn(const char *fmt, ...) { LOG_ERROR("Warning"); }
+void aom_tools_warn(const char *fmt, ...) { LOG_ERROR("Warning"); }
void die_codec(aom_codec_ctx_t *ctx, const char *s) {
const char *detail = aom_codec_error_detail(ctx);
diff --git a/common/tools_common.h b/common/tools_common.h
index 025bca2..b45d010 100644
--- a/common/tools_common.h
+++ b/common/tools_common.h
@@ -134,7 +134,7 @@
void die(const char *fmt, ...) AOM_NO_RETURN;
void fatal(const char *fmt, ...) AOM_NO_RETURN;
-void warn(const char *fmt, ...);
+void aom_tools_warn(const char *fmt, ...);
void die_codec(aom_codec_ctx_t *ctx, const char *s) AOM_NO_RETURN;
diff --git a/common/warnings.c b/common/warnings.c
index 2facee2..308cecd 100644
--- a/common/warnings.c
+++ b/common/warnings.c
@@ -86,7 +86,7 @@
/* Count and print warnings. */
for (warning = warning_list.warning_node; warning != NULL;
warning = warning->next_warning, ++num_warnings) {
- warn(warning->warning_string);
+ aom_tools_warn(warning->warning_string);
}
free_warning_list(&warning_list);
diff --git a/examples/svc_encoder_rtc.c b/examples/svc_encoder_rtc.c
index 73c46df..9aa4d83 100644
--- a/examples/svc_encoder_rtc.c
+++ b/examples/svc_encoder_rtc.c
@@ -285,7 +285,7 @@
} else if (arg_match(&arg, &speed_arg, argi)) {
app_input->speed = arg_parse_uint(&arg);
if (app_input->speed > 9) {
- warn("Mapping speed %d to speed 9.\n", app_input->speed);
+ aom_tools_warn("Mapping speed %d to speed 9.\n", app_input->speed);
}
} else if (arg_match(&arg, &aqmode_arg, argi)) {
app_input->aq_mode = arg_parse_uint(&arg);
