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

webrtc/modules/audio_coding/codecs/isac/fix/source/isacfix.c

 /*
  *  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 759 matching lines @@
 
 int WebRtcIsacfix_Decode(ISACFIX_MainStruct* ISAC_main_inst,
                          const uint8_t* encoded,
                          int16_t len,
                          int16_t* decoded,
                          int16_t* speechType)
 {
   ISACFIX_SubStruct *ISAC_inst;
   /* number of samples (480 or 960), output from decoder */
   /* that were actually used in the encoder/decoder (determined on the fly) */
-  int16_t     number_of_samples;
+  int16_t number_of_samples;
   int declen = 0;
 
   /* typecast pointer to real structure */
   ISAC_inst = (ISACFIX_SubStruct *)ISAC_main_inst;
 
   /* check if decoder initiated */
   if ((ISAC_inst->initflag & 1) != 1) {
     ISAC_inst->errorcode = ISAC_DECODER_NOT_INITIATED;
     return (-1);
   }
 
   /* Sanity check of packet length */
   if (len <= 0) {
     /* return error code if the packet length is null  or less */
     ISAC_inst->errorcode = ISAC_EMPTY_PACKET;
     return -1;
   } else if (len > (STREAM_MAXW16<<1)) {
     /* return error code if length of stream is too long */
     ISAC_inst->errorcode = ISAC_LENGTH_MISMATCH;
     return -1;
   }
 
   InitializeDecoderBitstream(len, &ISAC_inst->ISACdec_obj.bitstr_obj);
 
   read_be16(encoded, len, ISAC_inst->ISACdec_obj.bitstr_obj.stream);
 
   /* added for NetEq purposes (VAD/DTX related) */
   *speechType=1;
 
-  declen = WebRtcIsacfix_DecodeImpl(decoded,&ISAC_inst->ISACdec_obj, &number_of_samples);
-
+  declen = WebRtcIsacfix_DecodeImpl(decoded, &ISAC_inst->ISACdec_obj,
+                                    &number_of_samples);
   if (declen < 0) {
     /* Some error inside the decoder */
     ISAC_inst->errorcode = -(int16_t)declen;
     memset(decoded, 0, sizeof(int16_t) * MAX_FRAMESAMPLES);
     return -1;
   }
 
   /* error check */
 
-  if (declen & 0x0001) {
-    if (len != declen && len != declen + (((ISAC_inst->ISACdec_obj.bitstr_obj).stream[declen>>1]) & 0x00FF) ) {
+  if (declen & 1) {
+    if (len != declen &&
+        len != declen +
+            ((ISAC_inst->ISACdec_obj.bitstr_obj.stream[declen >> 1]) & 0xFF)) {
       ISAC_inst->errorcode = ISAC_LENGTH_MISMATCH;
       memset(decoded, 0, sizeof(int16_t) * number_of_samples);
       return -1;
     }
   } else {
-    if (len != declen && len != declen + (((ISAC_inst->ISACdec_obj.bitstr_obj).stream[declen>>1]) >> 8) ) {
+    if (len != declen &&
+        len != declen +
+            ((ISAC_inst->ISACdec_obj.bitstr_obj.stream[declen >> 1]) >> 8)) {
       ISAC_inst->errorcode = ISAC_LENGTH_MISMATCH;
       memset(decoded, 0, sizeof(int16_t) * number_of_samples);
       return -1;
     }
   }
 
   return number_of_samples;
 }
 
 
@@ skipping 24 matching lines @@
 #ifdef WEBRTC_ISAC_FIX_NB_CALLS_ENABLED
 int WebRtcIsacfix_DecodeNb(ISACFIX_MainStruct *ISAC_main_inst,
                            const uint16_t   *encoded,
                            int16_t          len,
                            int16_t          *decoded,
                            int16_t    *speechType)
 {
   ISACFIX_SubStruct *ISAC_inst;
   /* twice the number of samples (480 or 960), output from decoder */
   /* that were actually used in the encoder/decoder (determined on the fly) */
-  int16_t     number_of_samples;
+  int16_t number_of_samples;
   int declen = 0;
   int16_t dummy[FRAMESAMPLES/2];
 
 
   /* typecast pointer to real structure */
   ISAC_inst = (ISACFIX_SubStruct *)ISAC_main_inst;
 
   /* check if decoder initiated */
   if ((ISAC_inst->initflag & 1) != 1) {
     ISAC_inst->errorcode = ISAC_DECODER_NOT_INITIATED;
@@ skipping 10 matching lines @@
     return -1;
   }
 
   InitializeDecoderBitstream(len, &ISAC_inst->ISACdec_obj.bitstr_obj);
 
   read_be16(encoded, len, ISAC_inst->ISACdec_obj.bitstr_obj.stream);
 
   /* added for NetEq purposes (VAD/DTX related) */
   *speechType=1;
 
-  declen = WebRtcIsacfix_DecodeImpl(decoded,&ISAC_inst->ISACdec_obj, &number_of_samples);
-
+  declen = WebRtcIsacfix_DecodeImpl(decoded, &ISAC_inst->ISACdec_obj,
+                                    &number_of_samples);
   if (declen < 0) {
     /* Some error inside the decoder */
     ISAC_inst->errorcode = -(int16_t)declen;
     memset(decoded, 0, sizeof(int16_t) * FRAMESAMPLES);
     return -1;
   }
 
   /* error check */
 
-  if (declen & 0x0001) {
-    if (len != declen && len != declen + (((ISAC_inst->ISACdec_obj.bitstr_obj).stream[declen>>1]) & 0x00FF) ) {
+  if (declen & 1) {
+    if (len != declen &&
+        len != declen +
+            ((ISAC_inst->ISACdec_obj.bitstr_obj.stream[declen >> 1]) & 0xFF)) {
       ISAC_inst->errorcode = ISAC_LENGTH_MISMATCH;
       memset(decoded, 0, sizeof(int16_t) * number_of_samples);
       return -1;
     }
   } else {
-    if (len != declen && len != declen + (((ISAC_inst->ISACdec_obj.bitstr_obj).stream[declen>>1]) >> 8) ) {
+    if (len != declen &&
+        len != declen +
+            ((ISAC_inst->ISACdec_obj.bitstr_obj.stream[declen >>1]) >> 8)) {
       ISAC_inst->errorcode = ISAC_LENGTH_MISMATCH;
       memset(decoded, 0, sizeof(int16_t) * number_of_samples);
       return -1;
     }
   }
 
   WebRtcIsacfix_SplitAndFilter2(decoded, decoded, dummy, &ISAC_inst->ISACdec_obj.decimatorstr_obj);
 
   if (number_of_samples>FRAMESAMPLES) {
     WebRtcIsacfix_SplitAndFilter2(decoded + FRAMESAMPLES, decoded + FRAMESAMPLES/2,
@@ skipping 372 matching lines @@
 
   if (encoded_len_bytes < kRequiredEncodedLenBytes) {
     return -1;
   }
 
   InitializeDecoderBitstream(encoded_len_bytes, &streamdata);
 
   read_be16(encoded, kRequiredEncodedLenBytes, streamdata.stream);
 
   /* decode frame length, needed to get to the rateIndex in the bitstream */
-  err = WebRtcIsacfix_DecodeFrameLen(&streamdata, rateIndex);
+  int16_t frameLength;
+  err = WebRtcIsacfix_DecodeFrameLen(&streamdata, &frameLength);

[Peter Kasting, 2015/07/10 18:48:46]

This doesn't actually make a functional difference since in the case of error
the caller doesn't look at |rateIndex| anyway, and when there's no error it
would be overwritten below.  However, it's theoretically more correct, since the
frame length this call stores into the outparam has nothing to do with what
|rateIndex| was supposed to be set to.

   if (err<0)  // error check
     return err;
 
   /* decode BW estimation */
   err = WebRtcIsacfix_DecodeSendBandwidth(&streamdata, rateIndex);
   if (err<0)  // error check
     return err;
 
   return 0;
 }
@@ skipping 208 matching lines @@
   assert(inst->initflag & 1);  // Decoder initialized.
   WebRtcIsacfixBw_GetBandwidthInfo(&inst->bwestimator_obj, bwinfo);
 }
 
 void WebRtcIsacfix_SetBandwidthInfo(ISACFIX_MainStruct* ISAC_main_inst,
                                     const IsacBandwidthInfo* bwinfo) {
   ISACFIX_SubStruct* inst = (ISACFIX_SubStruct*)ISAC_main_inst;
   assert(inst->initflag & 2);  // Encoder initialized.
   WebRtcIsacfixBw_SetBandwidthInfo(&inst->bwestimator_obj, bwinfo);
 }