Reformat existing code. There should be no functional effects.

webrtc/modules/audio_coding/codecs/g722/test/testG722.cc

 /*
  *  Copyright (c) 2012 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 11 matching lines @@
 
 /* Runtime statistics */
 #include <time.h>
 #define CLOCKS_PER_SEC_G722  100000
 
 // Forward declaration
 typedef struct WebRtcG722EncInst    G722EncInst;
 typedef struct WebRtcG722DecInst    G722DecInst;
 
 /* function for reading audio data from PCM file */
-int readframe(int16_t *data, FILE *inp, int length)
+bool readframe(int16_t *data, FILE *inp, int length)
 {
-    short k, rlen, status = 0;
-
-    rlen = (short)fread(data, sizeof(int16_t), length, inp);
-    if (rlen < length) {
-        for (k = rlen; k < length; k++)
-            data[k] = 0;
-        status = 1;
-    }
-
-    return status;
+    short rlen = (short)fread(data, sizeof(int16_t), length, inp);
+    if (rlen >= length)
+      return false;
+    memset(data + rlen, 0, (length - rlen) * sizeof(int16_t));
+    return true;

[kwiberg-webrtc, 2015/06/10 11:58:32]

Comment return value. Namespace.

 }
 
 int main(int argc, char* argv[])
 {
     char inname[60], outbit[40], outname[40];
     FILE *inp, *outbitp, *outp;
 
-    int framecnt, endfile;
+    int framecnt;
+    bool endfile;

[kwiberg-webrtc, 2015/06/10 11:58:32]

Move to first use?

     int16_t framelength = 160;
     G722EncInst *G722enc_inst;
     G722DecInst *G722dec_inst;
     int err;
 
     /* Runtime statistics */
     double starttime;
     double runtime = 0;
     double length_file;
 
@@ skipping 43 matching lines @@
 
     /* Create and init */
     WebRtcG722_CreateEncoder((G722EncInst **)&G722enc_inst);
     WebRtcG722_CreateDecoder((G722DecInst **)&G722dec_inst);
     WebRtcG722_EncoderInit((G722EncInst *)G722enc_inst);
     WebRtcG722_DecoderInit((G722DecInst *)G722dec_inst);
 
 
     /* Initialize encoder and decoder */
     framecnt = 0;
-    endfile = 0;
-    while (endfile == 0) {
+    endfile = false;
+    while (!endfile) {
         framecnt++;
 
         /* Read speech block */
         endfile = readframe(shortdata, inp, framelength);
 
         /* Start clock before call to encoder and decoder */
         starttime = clock()/(double)CLOCKS_PER_SEC_G722;
 
         /* G.722 encoding + decoding */
         stream_len = WebRtcG722_Encode((G722EncInst *)G722enc_inst, shortdata, framelength, streamdata);
         err = WebRtcG722_Decode(G722dec_inst, streamdata, stream_len, decoded,
                                 speechType);
 
         /* Stop clock after call to encoder and decoder */
         runtime += (double)((clock()/(double)CLOCKS_PER_SEC_G722)-starttime);
 
         if (stream_len < 0 || err < 0) {
             /* exit if returned with error */
             printf("Error in encoder/decoder\n");
         } else {
           /* Write coded bits to file */
-          if (fwrite(streamdata, sizeof(short), stream_len/2,
-                     outbitp) != static_cast<size_t>(stream_len/2)) {
+          if (fwrite(streamdata, sizeof(short), stream_len / 2, outbitp) !=
+              static_cast<size_t>(stream_len / 2)) {
             return -1;
           }
           /* Write coded speech to file */
-          if (fwrite(decoded, sizeof(short), framelength,
-                     outp) != static_cast<size_t>(framelength)) {
+          if (fwrite(decoded, sizeof(short), framelength, outp) !=
+              static_cast<size_t>(framelength)) {
             return -1;
           }
         }
     }
 
     WebRtcG722_FreeEncoder((G722EncInst *)G722enc_inst);
     WebRtcG722_FreeDecoder((G722DecInst *)G722dec_inst);
 
     length_file = ((double)framecnt*(double)framelength/16000);
     printf("\n\nLength of speech file: %.1f s\n", length_file);
     printf("Time to run G.722:      %.2f s (%.2f %% of realtime)\n\n", runtime, (100*runtime/length_file));
     printf("---------------------END----------------------\n");
 
     fclose(inp);
     fclose(outbitp);
     fclose(outp);
 
     return 0;
 }