Update audio code to use size_t more correctly,

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 20 matching lines @@
 // Declare function pointers.
 FilterMaLoopFix WebRtcIsacfix_FilterMaLoopFix;
 Spec2Time WebRtcIsacfix_Spec2Time;
 Time2Spec WebRtcIsacfix_Time2Spec;
 MatrixProduct1 WebRtcIsacfix_MatrixProduct1;
 MatrixProduct2 WebRtcIsacfix_MatrixProduct2;
 
 /* This method assumes that |stream_size_bytes| is in valid range,
  * i.e. >= 0 && <=  STREAM_MAXW16_60MS
  */
-static void InitializeDecoderBitstream(int stream_size_bytes,
+static void InitializeDecoderBitstream(size_t stream_size_bytes,
                                        Bitstr_dec* bitstream) {
   bitstream->W_upper = 0xFFFFFFFF;
   bitstream->streamval = 0;
   bitstream->stream_index = 0;
   bitstream->full = 1;
   bitstream->stream_size = (stream_size_bytes + 1) >> 1;
   memset(bitstream->stream, 0, sizeof(bitstream->stream));
 }
 
 /**************************************************************************
@@ skipping 562 matching lines @@
  *      - rtp_seq_number    : the RTP number of the packet.
  *      - arr_ts            : the arrival time of the packet (from NetEq)
  *                            in samples.
  *
  * Return value             :  0 - Ok
  *                            -1 - Error
  */
 
 int16_t WebRtcIsacfix_UpdateBwEstimate1(ISACFIX_MainStruct *ISAC_main_inst,
                                         const uint8_t* encoded,
-                                        int32_t packet_size,
+                                        size_t packet_size,
                                         uint16_t rtp_seq_number,
                                         uint32_t arr_ts)
 {
   ISACFIX_SubStruct *ISAC_inst;
   Bitstr_dec streamdata;
   int16_t err;
-  const int kRequiredEncodedLenBytes = 10;
+  const size_t kRequiredEncodedLenBytes = 10;
 
   /* typecast pointer to real structure */
   ISAC_inst = (ISACFIX_SubStruct *)ISAC_main_inst;
 
   /* Sanity check of packet length */
-  if (packet_size <= 0) {
+  if (packet_size == 0) {
     /* return error code if the packet length is null or less */
     ISAC_inst->errorcode = ISAC_EMPTY_PACKET;
     return -1;
   } else if (packet_size > (STREAM_MAXW16<<1)) {
     /* return error code if length of stream is too long */
     ISAC_inst->errorcode = ISAC_LENGTH_MISMATCH;
     return -1;
   }
 
   /* check if decoder initiated */
@@ skipping 38 matching lines @@
  *      - send_ts           : Send Time Stamp from RTP header
  *      - arr_ts            : the arrival time of the packet (from NetEq)
  *                            in samples.
  *
  * Return value             :  0 - Ok
  *                            -1 - Error
  */
 
 int16_t WebRtcIsacfix_UpdateBwEstimate(ISACFIX_MainStruct *ISAC_main_inst,
                                        const uint8_t* encoded,
-                                       int32_t packet_size,
+                                       size_t packet_size,
                                        uint16_t rtp_seq_number,
                                        uint32_t send_ts,
                                        uint32_t arr_ts)
 {
   ISACFIX_SubStruct *ISAC_inst;
   Bitstr_dec streamdata;
   int16_t err;
-  const int kRequiredEncodedLenBytes = 10;
+  const size_t kRequiredEncodedLenBytes = 10;
 
   /* typecast pointer to real structure */
   ISAC_inst = (ISACFIX_SubStruct *)ISAC_main_inst;
 
   /* Sanity check of packet length */
-  if (packet_size <= 0) {
+  if (packet_size == 0) {
     /* return error code if the packet length is null  or less */
     ISAC_inst->errorcode = ISAC_EMPTY_PACKET;
     return -1;
   } else if (packet_size < kRequiredEncodedLenBytes) {
     ISAC_inst->errorcode = ISAC_PACKET_TOO_SHORT;
     return -1;
   } else if (packet_size > (STREAM_MAXW16<<1)) {
     /* return error code if length of stream is too long */
     ISAC_inst->errorcode = ISAC_LENGTH_MISMATCH;
     return -1;
@@ skipping 42 matching lines @@
  * Output:
  *      - decoded           : The decoded vector
  *
  * Return value             : >0 - number of samples in decoded vector
  *                            -1 - Error
  */
 
 
 int WebRtcIsacfix_Decode(ISACFIX_MainStruct* ISAC_main_inst,
                          const uint8_t* encoded,
-                         int16_t len,
+                         size_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;
-  int declen = 0;
+  size_t number_of_samples;
+  int declen_int = 0;
+  size_t declen;
 
   /* 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) {
+  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);
-  if (declen < 0) {
+  declen_int = WebRtcIsacfix_DecodeImpl(decoded, &ISAC_inst->ISACdec_obj,
+                                        &number_of_samples);
+  if (declen_int < 0) {
     /* Some error inside the decoder */
-    ISAC_inst->errorcode = -(int16_t)declen;
+    ISAC_inst->errorcode = -(int16_t)declen_int;
     memset(decoded, 0, sizeof(int16_t) * MAX_FRAMESAMPLES);
     return -1;
   }
+  declen = (size_t)declen_int;
 
   /* error check */
 
   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)) {
       ISAC_inst->errorcode = ISAC_LENGTH_MISMATCH;
       memset(decoded, 0, sizeof(int16_t) * number_of_samples);
       return -1;
     }
   }
 
-  return number_of_samples;
+  return (int)number_of_samples;
 }
 
 
 
 
 
 /****************************************************************************
  * WebRtcIsacfix_DecodeNb(...)
  *
  * This function decodes a ISAC frame in narrow-band (8 kHz sampling).
  * Output speech length will be a multiple of 240 samples: 240 or 480 samples,
  * depending on the framesize (30 or 60 ms).
  *
  * The function is enabled if WEBRTC_ISAC_FIX_NB_CALLS_ENABLED is defined
  *
  * Input:
  *      - ISAC_main_inst    : ISAC instance.
  *      - encoded           : encoded ISAC frame(s)
  *      - len               : bytes in encoded vector
  *
  * Output:
  *      - decoded           : The decoded vector
  *
  * Return value             : >0 - number of samples in decoded vector
  *                            -1 - Error
  */
 
 #ifdef WEBRTC_ISAC_FIX_NB_CALLS_ENABLED
 int WebRtcIsacfix_DecodeNb(ISACFIX_MainStruct *ISAC_main_inst,
                            const uint16_t   *encoded,

[minyue-webrtc, 2015/08/12 16:08:08]

It seems that the spacing here was not good. Would you arrange them a bit? also
other functions that the CL touches.

[Peter Kasting, 2015/08/14 22:32:26]

Done (in this file)

-                           int16_t          len,
+                           size_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;
-  int declen = 0;
+  size_t number_of_samples;
+  int declen_int = 0;
+  size_t declen;
   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;
     return (-1);
   }
 
-  if (len <= 0) {
+  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);
-  if (declen < 0) {
+  declen_int = WebRtcIsacfix_DecodeImpl(decoded,&ISAC_inst->ISACdec_obj,
+                                        &number_of_samples);
+  if (declen_int < 0) {
     /* Some error inside the decoder */
-    ISAC_inst->errorcode = -(int16_t)declen;
+    ISAC_inst->errorcode = -(int16_t)declen_int;
     memset(decoded, 0, sizeof(int16_t) * FRAMESAMPLES);
     return -1;
   }
+  declen = (size_t)declen_int;
 
   /* error check */
 
   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)) {
       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,
                                   dummy, &ISAC_inst->ISACdec_obj.decimatorstr_obj);
   }
 
-  return number_of_samples/2;
+  return (int)(number_of_samples / 2);
 }
 #endif /* WEBRTC_ISAC_FIX_NB_CALLS_ENABLED */
 
 
 /****************************************************************************
  * WebRtcIsacfix_DecodePlcNb(...)
  *
  * This function conducts PLC for ISAC frame(s) in narrow-band (8kHz sampling).
  * Output speech length  will be "240*noOfLostFrames" samples
  * that is equevalent of "30*noOfLostFrames" millisecond.
  *
  * The function is enabled if WEBRTC_ISAC_FIX_NB_CALLS_ENABLED is defined
  *
  * Input:
  *      - ISAC_main_inst    : ISAC instance.
  *      - noOfLostFrames    : Number of PLC frames (240 sample=30ms) to produce
  *
  * Output:
  *      - decoded           : The decoded vector
  *
- * Return value             : >0 - number of samples in decoded PLC vector
- *                            -1 - Error
+ * Return value             : Number of samples in decoded PLC vector
  */
 
 #ifdef WEBRTC_ISAC_FIX_NB_CALLS_ENABLED
-int16_t WebRtcIsacfix_DecodePlcNb(ISACFIX_MainStruct *ISAC_main_inst,
-                                  int16_t          *decoded,
-                                  int16_t noOfLostFrames )
+size_t WebRtcIsacfix_DecodePlcNb(ISACFIX_MainStruct *ISAC_main_inst,
+                                 int16_t          *decoded,
+                                 size_t noOfLostFrames )
 {
-  int16_t no_of_samples, declen, k, ok;
+  size_t no_of_samples, declen, k;
   int16_t outframeNB[FRAMESAMPLES];
   int16_t outframeWB[FRAMESAMPLES];
   int16_t dummy[FRAMESAMPLES/2];
 
 
   ISACFIX_SubStruct *ISAC_inst;
   /* typecast pointer to real structure */
   ISAC_inst = (ISACFIX_SubStruct *)ISAC_main_inst;
 
   /* Limit number of frames to two = 60 msec. Otherwise we exceed data vectors */
@@ skipping 36 matching lines @@
  * that is equevalent of "30*noOfLostFrames" millisecond.
  *
  * Input:
  *      - ISAC_main_inst    : ISAC instance.
  *      - noOfLostFrames    : Number of PLC frames (480sample = 30ms)
  *                                to produce
  *
  * Output:
  *      - decoded           : The decoded vector
  *
- * Return value             : >0 - number of samples in decoded PLC vector
- *                            -1 - Error
+ * Return value             : Number of samples in decoded PLC vector
  */
 
-int16_t WebRtcIsacfix_DecodePlc(ISACFIX_MainStruct *ISAC_main_inst,
-                                int16_t          *decoded,
-                                int16_t noOfLostFrames)
+size_t WebRtcIsacfix_DecodePlc(ISACFIX_MainStruct *ISAC_main_inst,
+                               int16_t          *decoded,
+                               size_t noOfLostFrames)
 {
 
-  int16_t no_of_samples, declen, k;
+  size_t no_of_samples, declen, k;
   int16_t outframe16[MAX_FRAMESAMPLES];
 
   ISACFIX_SubStruct *ISAC_inst;
   /* typecast pointer to real structure */
   ISAC_inst = (ISACFIX_SubStruct *)ISAC_main_inst;
 
   /* Limit number of frames to two = 60 msec. Otherwise we exceed data vectors */
   if (noOfLostFrames > 2) {
     noOfLostFrames = 2;
   }
@@ skipping 214 matching lines @@
  *
  * Input:
  *      - encoded       : Encoded bitstream
  *
  * Output:
  *      - frameLength   : Length of frame in packet (in samples)
  *
  */
 
 int16_t WebRtcIsacfix_ReadFrameLen(const uint8_t* encoded,
-                                   int encoded_len_bytes,
-                                   int16_t* frameLength)
+                                   size_t encoded_len_bytes,
+                                   size_t* frameLength)
 {
   Bitstr_dec streamdata;
   int16_t err;
-  const int kRequiredEncodedLenBytes = 10;
+  const size_t kRequiredEncodedLenBytes = 10;
 
   if (encoded_len_bytes < kRequiredEncodedLenBytes) {
     return -1;
   }
 
   InitializeDecoderBitstream(encoded_len_bytes, &streamdata);
 
   read_be16(encoded, kRequiredEncodedLenBytes, streamdata.stream);
 
   /* decode frame length */
@@ skipping 13 matching lines @@
  * Input:
  *      - encoded       : Encoded bitstream
  *
  * Output:
  *      - frameLength   : Length of frame in packet (in samples)
  *      - rateIndex     : Bandwidth estimate in bitstream
  *
  */
 
 int16_t WebRtcIsacfix_ReadBwIndex(const uint8_t* encoded,
-                                  int encoded_len_bytes,
+                                  size_t encoded_len_bytes,
                                   int16_t* rateIndex)
 {
   Bitstr_dec streamdata;
   int16_t err;
-  const int kRequiredEncodedLenBytes = 10;
+  const size_t kRequiredEncodedLenBytes = 10;
 
   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 */
-  int16_t frameLength;
-  err = WebRtcIsacfix_DecodeFrameLen(&streamdata, &frameLength);
+  size_t framelength;
+  err = WebRtcIsacfix_DecodeFrameLen(&streamdata, &framelength);
   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);
 }