Commit c901a4f0 authored by Jim Bankoski's avatar Jim Bankoski Committed by Gerrit Code Review

vpxenc.c : static warnings cleanout

Change-Id: Ia55317606c78a9d984db0321ef142548d20b64bc
1: dereference of global->codec checked
2: warning fails to recognize fatal(xxx) as exit or return
3: ctrl_args_map can be null
4: streams can be null
parent e35c54e9
...@@ -740,8 +740,9 @@ static void parse_global_config(struct VpxEncoderConfig *global, char **argv) { ...@@ -740,8 +740,9 @@ static void parse_global_config(struct VpxEncoderConfig *global, char **argv) {
#if CONFIG_VP9_ENCODER #if CONFIG_VP9_ENCODER
// Make default VP9 passes = 2 until there is a better quality 1-pass // Make default VP9 passes = 2 until there is a better quality 1-pass
// encoder // encoder
global->passes = (strcmp(global->codec->name, "vp9") == 0 && if (global->codec != NULL && global->codec->name != NULL)
global->deadline != VPX_DL_REALTIME) ? 2 : 1; global->passes = (strcmp(global->codec->name, "vp9") == 0 &&
global->deadline != VPX_DL_REALTIME) ? 2 : 1;
#else #else
global->passes = 1; global->passes = 1;
#endif #endif
...@@ -809,8 +810,10 @@ static struct stream_state *new_stream(struct VpxEncoderConfig *global, ...@@ -809,8 +810,10 @@ static struct stream_state *new_stream(struct VpxEncoderConfig *global,
struct stream_state *stream; struct stream_state *stream;
stream = calloc(1, sizeof(*stream)); stream = calloc(1, sizeof(*stream));
if (!stream) if (stream == NULL) {
fatal("Failed to allocate new stream."); fatal("Failed to allocate new stream.");
}
if (prev) { if (prev) {
memcpy(stream, prev, sizeof(*stream)); memcpy(stream, prev, sizeof(*stream));
stream->index++; stream->index++;
...@@ -996,12 +999,13 @@ static int parse_stream_params(struct VpxEncoderConfig *global, ...@@ -996,12 +999,13 @@ static int parse_stream_params(struct VpxEncoderConfig *global,
* instance of this control. * instance of this control.
*/ */
for (j = 0; j < config->arg_ctrl_cnt; j++) for (j = 0; j < config->arg_ctrl_cnt; j++)
if (config->arg_ctrls[j][0] == ctrl_args_map[i]) if (ctrl_args_map != NULL &&
config->arg_ctrls[j][0] == ctrl_args_map[i])
break; break;
/* Update/insert */ /* Update/insert */
assert(j < (int)ARG_CTRL_CNT_MAX); assert(j < (int)ARG_CTRL_CNT_MAX);
if (j < (int)ARG_CTRL_CNT_MAX) { if (ctrl_args_map != NULL && j < (int)ARG_CTRL_CNT_MAX) {
config->arg_ctrls[j][0] = ctrl_args_map[i]; config->arg_ctrls[j][0] = ctrl_args_map[i];
config->arg_ctrls[j][1] = arg_parse_enum_or_int(&arg); config->arg_ctrls[j][1] = arg_parse_enum_or_int(&arg);
if (j == config->arg_ctrl_cnt) if (j == config->arg_ctrl_cnt)
...@@ -1788,7 +1792,8 @@ int main(int argc, const char **argv_) { ...@@ -1788,7 +1792,8 @@ int main(int argc, const char **argv_) {
got_data = 0; got_data = 0;
FOREACH_STREAM(get_cx_data(stream, &global, &got_data)); FOREACH_STREAM(get_cx_data(stream, &global, &got_data));
if (!got_data && input.length && !streams->frames_out) { if (!got_data && input.length && streams != NULL &&
!streams->frames_out) {
lagged_count = global.limit ? seen_frames : ftello(input.file); lagged_count = global.limit ? seen_frames : ftello(input.file);
} else if (input.length) { } else if (input.length) {
int64_t remaining; int64_t remaining;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment