Update audio code to use size_t more correctly, webrtc/common_audio/resampler/

webrtc/common_audio/resampler/sinc_resampler.h

 /*

[Andrew MacDonald, 2015/07/23 01:07:03]

Are you intending to modify Chromium's version similarly:
https://code.google.com/p/chromium/codesearch#chromium/src/media/base/sinc_re...

It would be nice to minimize the diff between them.

[Peter Kasting, 2015/07/23 06:02:16]

I wasn't, mostly because I was afraid it would be another months-long yak shave
and I didn't have the heart if so.  I probably should.  Ugh :(

It kinda sucks that we have this code in two places.  Can it be put somewhere
shareable between the two?

[Andrew MacDonald, 2015/07/24 03:28:33]

I can sympathize. They've already diverged somewhat, so it's not a big deal.
Yes, we might be able to have Chromium use webrtc's version.

  *  Copyright (c) 2013 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.
  */
 
 // Modified from the Chromium original here:
 // src/media/base/sinc_resampler.h
 
 #ifndef WEBRTC_COMMON_AUDIO_RESAMPLER_SINC_RESAMPLER_H_
 #define WEBRTC_COMMON_AUDIO_RESAMPLER_SINC_RESAMPLER_H_
 
 #include "webrtc/base/constructormagic.h"
 #include "webrtc/base/scoped_ptr.h"
 #include "webrtc/system_wrappers/interface/aligned_malloc.h"
 #include "webrtc/test/testsupport/gtest_prod_util.h"
 #include "webrtc/typedefs.h"
 
 namespace webrtc {
 
 // Callback class for providing more data into the resampler.  Expects |frames|
 // of data to be rendered into |destination|; zero padded if not enough frames
 // are available to satisfy the request.
 class SincResamplerCallback {
  public:
   virtual ~SincResamplerCallback() {}
-  virtual void Run(int frames, float* destination) = 0;
+  virtual void Run(size_t frames, float* destination) = 0;
 };
 
 // SincResampler is a high-quality single-channel sample-rate converter.
 class SincResampler {
  public:
   // The kernel size can be adjusted for quality (higher is better) at the
   // expense of performance.  Must be a multiple of 32.
   // TODO(dalecurtis): Test performance to see if we can jack this up to 64+.
-  static const int kKernelSize = 32;
+  static const size_t kKernelSize = 32;
 
   // Default request size.  Affects how often and for how much SincResampler
   // calls back for input.  Must be greater than kKernelSize.
-  static const int kDefaultRequestSize = 512;
+  static const size_t kDefaultRequestSize = 512;
 
   // The kernel offset count is used for interpolation and is the number of
   // sub-sample kernel shifts.  Can be adjusted for quality (higher is better)
   // at the expense of allocating more memory.
-  static const int kKernelOffsetCount = 32;
-  static const int kKernelStorageSize = kKernelSize * (kKernelOffsetCount + 1);
+  static const size_t kKernelOffsetCount = 32;
+  static const size_t kKernelStorageSize =
+      kKernelSize * (kKernelOffsetCount + 1);
 
   // Constructs a SincResampler with the specified |read_cb|, which is used to
   // acquire audio data for resampling.  |io_sample_rate_ratio| is the ratio
   // of input / output sample rates.  |request_frames| controls the size in
   // frames of the buffer requested by each |read_cb| call.  The value must be
   // greater than kKernelSize.  Specify kDefaultRequestSize if there are no
   // request size constraints.
   SincResampler(double io_sample_rate_ratio,
-                int request_frames,
+                size_t request_frames,
                 SincResamplerCallback* read_cb);
   virtual ~SincResampler();
 
   // Resample |frames| of data from |read_cb_| into |destination|.
-  void Resample(int frames, float* destination);
+  void Resample(size_t frames, float* destination);
 
   // The maximum size in frames that guarantees Resample() will only make a
   // single call to |read_cb_| for more data.
-  int ChunkSize() const;
+  size_t ChunkSize() const;
 
-  int request_frames() const { return request_frames_; }
+  size_t request_frames() const { return request_frames_; }
 
   // Flush all buffered data and reset internal indices.  Not thread safe, do
   // not call while Resample() is in progress.
   void Flush();
 
   // Update |io_sample_rate_ratio_|.  SetRatio() will cause a reconstruction of
   // the kernels used for resampling.  Not thread safe, do not call while
   // Resample() is in progress.
   //
   // TODO(ajm): Use this in PushSincResampler rather than reconstructing
@@ skipping 37 matching lines @@
   // double precision to avoid drift.
   double virtual_source_idx_;
 
   // The buffer is primed once at the very beginning of processing.
   bool buffer_primed_;
 
   // Source of data for resampling.
   SincResamplerCallback* read_cb_;
 
   // The size (in samples) to request from each |read_cb_| execution.
-  const int request_frames_;
+  const size_t request_frames_;
 
   // The number of source frames processed per pass.
-  int block_size_;
+  size_t block_size_;
 
   // The size (in samples) of the internal buffer used by the resampler.
-  const int input_buffer_size_;
+  const size_t input_buffer_size_;
 
   // Contains kKernelOffsetCount kernels back-to-back, each of size kKernelSize.
   // The kernel offsets are sub-sample shifts of a windowed sinc shifted from
   // 0.0 to 1.0 sample.
   rtc::scoped_ptr<float[], AlignedFreeDeleter> kernel_storage_;
   rtc::scoped_ptr<float[], AlignedFreeDeleter> kernel_pre_sinc_storage_;
   rtc::scoped_ptr<float[], AlignedFreeDeleter> kernel_window_storage_;
 
   // Data from the source is copied into this buffer for each processing pass.
   rtc::scoped_ptr<float[], AlignedFreeDeleter> input_buffer_;
@@ skipping 15 matching lines @@
   float* const r2_;
   float* r3_;
   float* r4_;
 
   DISALLOW_COPY_AND_ASSIGN(SincResampler);
 };
 
 }  // namespace webrtc
 
 #endif  // WEBRTC_COMMON_AUDIO_RESAMPLER_SINC_RESAMPLER_H_