File kvazaar.memset.patch of Package kvazaar

File kvazaar.memset.patch of Package kvazaar (Revision 12)

Currently displaying revision 12 , Show latest

gcc7-7.1.1+r248152-1.2
[  112s] rdo.c: In function 'kvz_rdoq':
[  112s] rdo.c:563:14: error: 'memset' used with length equal to number of elements without multiplication by element size [-Werror=memset-elt-size]
[  112s]      case 16: memset(sig_coeffgroup_flag, 0, 16 * sizeof(sig_coeffgroup_flag[0])); break;
--- a/src/rdo.c
+++ b/src/rdo.c
@@ -555,6 +555,7 @@ void kvz_rdoq(encoder_state_t * const st
 
   uint32_t cg_num = width * height >> 4;
 
+#if 0
   // Explicitly tell the only possible numbers of elements to be zeroed.
   // Hope the compiler is able to utilize this information.
   switch (cg_num) {
@@ -564,6 +565,9 @@ void kvz_rdoq(encoder_state_t * const st
     case 64: memset(sig_coeffgroup_flag, 0, 64 * sizeof(sig_coeffgroup_flag[0])); break;
     default: assert(0 && "There should be 1, 4, 16 or 64 coefficient groups");
   }
+#else
+  memset(&sig_coeffgroup_flag, 0, sizeof(sig_coeffgroup_flag));
+#endif
 
   cabac_ctx_t *base_coeff_group_ctx = &(cabac->ctx.cu_sig_coeff_group_model[type]);
   cabac_ctx_t *baseCtx              = (type == 0) ? &(cabac->ctx.cu_sig_model_luma[0]) : &(cabac->ctx.cu_sig_model_chroma[0]);