shithub: libvpx

Download patch

ref: 0bbc7f9825516e8e59a8a701e43df1aa967fd70a
parent: d6321c3e68dd675da246d8b191db142d44196d51
parent: e526c048729212db8ad046ab89d256b3a22fef26
author: Minghai Shang <minghai@google.com>
date: Fri Feb 28 06:50:48 EST 2014 

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


--- a/vpx/src/svc_encodeframe.c
+++ b/vpx/src/svc_encodeframe.c
@@ -548,15 +548,20 @@
 
     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);
+      }
     }
   }
 
-- 
⑨