generic-library/vpx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge "[svc] Fix "possible loss of data", "division by zero" and "index 5 out of bounds for type" compiler warings"

Browse Source
This commit is contained in:
Minghai Shang 2014-02-28 11:50:48 -08:00 committed by Gerrit Code Review
commit 0bbc7f9825
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
vpx/src/svc_encodeframe.c
View File

@ -548,15 +548,20 @@ vpx_codec_err_t vpx_svc_init(SvcContext *svc_ctx, vpx_codec_ctx_t *codec_ctx,
for (i = 0; i < si->layers; ++i) {
int pos = i + VPX_SS_MAX_LAYERS - svc_ctx->spatial_layers;
alloc_ratio[i] = si->scaling_factor_num[pos] * 1.0 /
si->scaling_factor_den[pos];
alloc_ratio[i] *= alloc_ratio[i];
total += alloc_ratio[i];
if (pos < VPX_SS_MAX_LAYERS && si->scaling_factor_den[pos] > 0) {
alloc_ratio[i] = (float)(si->scaling_factor_num[pos] * 1.0 /
si->scaling_factor_den[pos]);
alloc_ratio[i] *= alloc_ratio[i];
total += alloc_ratio[i];
}
}
for (i = 0; i < si->layers; ++i) {
enc_cfg->ss_target_bitrate[i] = enc_cfg->rc_target_bitrate *
alloc_ratio[i] / total;
if (total > 0) {
enc_cfg->ss_target_bitrate[i] = (unsigned int)
(enc_cfg->rc_target_bitrate * alloc_ratio[i] / total);
}
}
}