| Index: webrtc/modules/audio_coding/neteq/decision_logic.h
|
| diff --git a/webrtc/modules/audio_coding/neteq/decision_logic.h b/webrtc/modules/audio_coding/neteq/decision_logic.h
|
| index 672ce939d41fc9aaf3024ccbedd9ecedc963cf07..cb3dba0edc8111f607623f74bfb44e00903301f3 100644
|
| --- a/webrtc/modules/audio_coding/neteq/decision_logic.h
|
| +++ b/webrtc/modules/audio_coding/neteq/decision_logic.h
|
| @@ -34,7 +34,7 @@ class DecisionLogic {
|
| // Static factory function which creates different types of objects depending
|
| // on the |playout_mode|.
|
| static DecisionLogic* Create(int fs_hz,
|
| - int output_size_samples,
|
| + size_t output_size_samples,
|
| NetEqPlayoutMode playout_mode,
|
| DecoderDatabase* decoder_database,
|
| const PacketBuffer& packet_buffer,
|
| @@ -43,7 +43,7 @@ class DecisionLogic {
|
|
|
| // Constructor.
|
| DecisionLogic(int fs_hz,
|
| - int output_size_samples,
|
| + size_t output_size_samples,
|
| NetEqPlayoutMode playout_mode,
|
| DecoderDatabase* decoder_database,
|
| const PacketBuffer& packet_buffer,
|
| @@ -60,7 +60,7 @@ class DecisionLogic {
|
| void SoftReset();
|
|
|
| // Sets the sample rate and the output block size.
|
| - void SetSampleRate(int fs_hz, int output_size_samples);
|
| + void SetSampleRate(int fs_hz, size_t output_size_samples);
|
|
|
| // Returns the operation that should be done next. |sync_buffer| and |expand|
|
| // are provided for reference. |decoder_frame_length| is the number of samples
|
| @@ -75,7 +75,7 @@ class DecisionLogic {
|
| // return value.
|
| Operations GetDecision(const SyncBuffer& sync_buffer,
|
| const Expand& expand,
|
| - int decoder_frame_length,
|
| + size_t decoder_frame_length,
|
| const RTPHeader* packet_header,
|
| Modes prev_mode,
|
| bool play_dtmf,
|
| @@ -101,12 +101,12 @@ class DecisionLogic {
|
|
|
| // Accessors and mutators.
|
| void set_sample_memory(int32_t value) { sample_memory_ = value; }
|
| - int generated_noise_samples() const { return generated_noise_samples_; }
|
| - void set_generated_noise_samples(int value) {
|
| + size_t generated_noise_samples() const { return generated_noise_samples_; }
|
| + void set_generated_noise_samples(size_t value) {
|
| generated_noise_samples_ = value;
|
| }
|
| - int packet_length_samples() const { return packet_length_samples_; }
|
| - void set_packet_length_samples(int value) {
|
| + size_t packet_length_samples() const { return packet_length_samples_; }
|
| + void set_packet_length_samples(size_t value) {
|
| packet_length_samples_ = value;
|
| }
|
| void set_prev_time_scale(bool value) { prev_time_scale_ = value; }
|
| @@ -134,7 +134,7 @@ class DecisionLogic {
|
| // Should be implemented by derived classes.
|
| virtual Operations GetDecisionSpecialized(const SyncBuffer& sync_buffer,
|
| const Expand& expand,
|
| - int decoder_frame_length,
|
| + size_t decoder_frame_length,
|
| const RTPHeader* packet_header,
|
| Modes prev_mode,
|
| bool play_dtmf,
|
| @@ -142,18 +142,18 @@ class DecisionLogic {
|
|
|
| // Updates the |buffer_level_filter_| with the current buffer level
|
| // |buffer_size_packets|.
|
| - void FilterBufferLevel(int buffer_size_packets, Modes prev_mode);
|
| + void FilterBufferLevel(size_t buffer_size_packets, Modes prev_mode);
|
|
|
| DecoderDatabase* decoder_database_;
|
| const PacketBuffer& packet_buffer_;
|
| DelayManager* delay_manager_;
|
| BufferLevelFilter* buffer_level_filter_;
|
| int fs_mult_;
|
| - int output_size_samples_;
|
| + size_t output_size_samples_;
|
| CngState cng_state_; // Remember if comfort noise is interrupted by other
|
| // event (e.g., DTMF).
|
| - int generated_noise_samples_;
|
| - int packet_length_samples_;
|
| + size_t generated_noise_samples_;
|
| + size_t packet_length_samples_;
|
| int sample_memory_;
|
| bool prev_time_scale_;
|
| int timescale_hold_off_;
|
|
|