Commit 24025c04 authored by Jim Bankoski's avatar Jim Bankoski Committed by James Zern

vp9_cx_iface vp9_dx_iface vpxdec vs warnings

Change-Id: I747982e7d1157a8b45f4034ddf207306f9f957e0
parent 6a6c4277
...@@ -365,7 +365,7 @@ static vpx_codec_err_t set_vp9e_config(VP9_CONFIG *oxcf, ...@@ -365,7 +365,7 @@ static vpx_codec_err_t set_vp9e_config(VP9_CONFIG *oxcf,
memcpy(oxcf->ts_rate_decimator, cfg.ts_rate_decimator, memcpy(oxcf->ts_rate_decimator, cfg.ts_rate_decimator,
sizeof(cfg.ts_rate_decimator)); sizeof(cfg.ts_rate_decimator));
} else if (oxcf->ts_number_layers == 1) { } else if (oxcf->ts_number_layers == 1) {
oxcf->ts_target_bitrate[0] = oxcf->target_bandwidth; oxcf->ts_target_bitrate[0] = (int)oxcf->target_bandwidth;
oxcf->ts_rate_decimator[0] = 1; oxcf->ts_rate_decimator[0] = 1;
} }
...@@ -639,7 +639,7 @@ static int write_superframe_index(vpx_codec_alg_priv_t *ctx) { ...@@ -639,7 +639,7 @@ static int write_superframe_index(vpx_codec_alg_priv_t *ctx) {
*x++ = marker; *x++ = marker;
for (i = 0; i < ctx->pending_frame_count; i++) { for (i = 0; i < ctx->pending_frame_count; i++) {
int this_sz = ctx->pending_frame_sizes[i]; unsigned int this_sz = (unsigned int)ctx->pending_frame_sizes[i];
for (j = 0; j <= mag; j++) { for (j = 0; j <= mag; j++) {
*x++ = this_sz & 0xff; *x++ = this_sz & 0xff;
...@@ -1049,7 +1049,7 @@ static vpx_codec_err_t vp9e_set_svc_layer_id(vpx_codec_alg_priv_t *ctx, ...@@ -1049,7 +1049,7 @@ static vpx_codec_err_t vp9e_set_svc_layer_id(vpx_codec_alg_priv_t *ctx,
return VPX_CODEC_INVALID_PARAM; return VPX_CODEC_INVALID_PARAM;
} }
if (cpi->svc.spatial_layer_id < 0 || if (cpi->svc.spatial_layer_id < 0 ||
cpi->svc.spatial_layer_id >= ctx->cfg.ss_number_layers) { cpi->svc.spatial_layer_id >= (int)ctx->cfg.ss_number_layers) {
return VPX_CODEC_INVALID_PARAM; return VPX_CODEC_INVALID_PARAM;
} }
return VPX_CODEC_OK; return VPX_CODEC_OK;
......
...@@ -214,7 +214,7 @@ static vpx_codec_err_t vp9_get_si(vpx_codec_alg_priv_t *ctx, ...@@ -214,7 +214,7 @@ static vpx_codec_err_t vp9_get_si(vpx_codec_alg_priv_t *ctx,
? sizeof(vp9_stream_info_t) ? sizeof(vp9_stream_info_t)
: sizeof(vpx_codec_stream_info_t); : sizeof(vpx_codec_stream_info_t);
memcpy(si, &ctx->si, sz); memcpy(si, &ctx->si, sz);
si->sz = sz; si->sz = (unsigned int)sz;
return VPX_CODEC_OK; return VPX_CODEC_OK;
} }
...@@ -462,7 +462,7 @@ static vpx_codec_err_t vp9_decode(vpx_codec_alg_priv_t *ctx, ...@@ -462,7 +462,7 @@ static vpx_codec_err_t vp9_decode(vpx_codec_alg_priv_t *ctx,
while (data_start < data_end && *data_start == 0) while (data_start < data_end && *data_start == 0)
data_start++; data_start++;
data_sz = data_end - data_start; data_sz = (unsigned int)(data_end - data_start);
} while (data_start < data_end); } while (data_start < data_end);
return res; return res;
} }
......
...@@ -791,7 +791,8 @@ int main_loop(int argc, const char **argv_) { ...@@ -791,7 +791,8 @@ int main_loop(int argc, const char **argv_) {
vpx_usec_timer_start(&timer); vpx_usec_timer_start(&timer);
if (vpx_codec_decode(&decoder, buf, bytes_in_buffer, NULL, 0)) { if (vpx_codec_decode(&decoder, buf, (unsigned int)bytes_in_buffer,
NULL, 0)) {
const char *detail = vpx_codec_error_detail(&decoder); const char *detail = vpx_codec_error_detail(&decoder);
warn("Failed to decode frame %d: %s", warn("Failed to decode frame %d: %s",
frame_in, vpx_codec_error(&decoder)); frame_in, vpx_codec_error(&decoder));
...@@ -873,7 +874,7 @@ int main_loop(int argc, const char **argv_) { ...@@ -873,7 +874,7 @@ int main_loop(int argc, const char **argv_) {
vpx_input_ctx.height, vpx_input_ctx.height,
&vpx_input_ctx.framerate, img->fmt); &vpx_input_ctx.framerate, img->fmt);
if (do_md5) { if (do_md5) {
MD5Update(&md5_ctx, (md5byte *)buf, len); MD5Update(&md5_ctx, (md5byte *)buf, (unsigned int)len);
} else { } else {
fputs(buf, outfile); fputs(buf, outfile);
} }
...@@ -882,7 +883,7 @@ int main_loop(int argc, const char **argv_) { ...@@ -882,7 +883,7 @@ int main_loop(int argc, const char **argv_) {
// Y4M frame header // Y4M frame header
len = y4m_write_frame_header(buf, sizeof(buf)); len = y4m_write_frame_header(buf, sizeof(buf));
if (do_md5) { if (do_md5) {
MD5Update(&md5_ctx, (md5byte *)buf, len); MD5Update(&md5_ctx, (md5byte *)buf, (unsigned int)len);
} else { } else {
fputs(buf, outfile); fputs(buf, outfile);
} }
......
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