Miscellaneous changes split from https://codereview.webrtc.org/1230503003 .

webrtc/modules/audio_coding/codecs/isac/fix/test/test_iSACfixfloat.c

 /*
  *  Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 538 matching lines @@
           // exit(EXIT_FAILURE);
         }
         /* iSAC decoding */
 
         if (plc && (framecnt + 1) % 10 == 0) {
           if (nbTest != 2)
             declen = WebRtcIsacfix_DecodePlc(ISACFIX_main_inst, decoded, 1);
           else
             declen = WebRtcIsacfix_DecodePlcNb(ISACFIX_main_inst, decoded, 1);
         } else {
-          if (nbTest != 2)
+          if (nbTest != 2) {
             declen = WebRtcIsacfix_Decode(ISACFIX_main_inst, streamdata,
                                           stream_len, decoded, speechType);
-          else
+          } else {
             declen = WebRtcIsacfix_DecodeNb(ISACFIX_main_inst, streamdata,
                                             stream_len, decoded, speechType);
+          }
         }
         if (declen <= 0) {
           /* exit if returned with error */
           errtype = WebRtcIsacfix_GetErrorCode(ISACFIX_main_inst);
           printf("\n\nError in decoder: %d.\n\n", errtype);
           // exit(EXIT_FAILURE);
         }
       }
 
       /* Write decoded speech frame to file */
       fwrite(decoded, sizeof(int16_t), declen, outp);
     }
 
     fprintf(stderr, "  \rframe = %d", framecnt);
     framecnt++;
 
 #ifdef _DEBUG
 
     totalsmpls += declen;
     totalbits += 8 * stream_len;
-    kbps = ((double)FS) / ((double)cur_framesmpls) * 8.0 * stream_len / 1000.0;
+    kbps = (double)FS / (double)cur_framesmpls * 8.0 * stream_len / 1000.0;
     fy = fopen("bit_rate.dat", "a");
     fprintf(fy, "Frame %i = %0.14f\n", framecnt, kbps);
     fclose(fy);
 
 #endif /* _DEBUG */
   }
 
 #ifdef _DEBUG
   printf("\n\ntotal bits               = %d bits", totalbits);
   printf("\nmeasured average bitrate = %0.3f kbits/s",
@@ skipping 13 matching lines @@
   fclose(outp);
 
   WebRtcIsac_Free(ISAC_main_inst);
   WebRtcIsacfix_Free(ISACFIX_main_inst);
 
   // fclose(histfile);
   // fclose(ratefile);
 
   return 0;
 }