| Index: webrtc/modules/audio_coding/codecs/g711/include/audio_encoder_pcm.h
|
| diff --git a/webrtc/modules/audio_coding/codecs/g711/include/audio_encoder_pcm.h b/webrtc/modules/audio_coding/codecs/g711/include/audio_encoder_pcm.h
|
| index c8690379c6b79bcad676a73fb8fa4b57f013d9b3..7d45f3f71df7ae31566b9bcf29a35855e4e5bd3d 100644
|
| --- a/webrtc/modules/audio_coding/codecs/g711/include/audio_encoder_pcm.h
|
| +++ b/webrtc/modules/audio_coding/codecs/g711/include/audio_encoder_pcm.h
|
| @@ -39,8 +39,8 @@ class AudioEncoderPcm : public AudioEncoder {
|
| int SampleRateHz() const override;
|
| int NumChannels() const override;
|
| size_t MaxEncodedBytes() const override;
|
| - int Num10MsFramesInNextPacket() const override;
|
| - int Max10MsFramesInAPacket() const override;
|
| + size_t Num10MsFramesInNextPacket() const override;
|
| + size_t Max10MsFramesInAPacket() const override;
|
| int GetTargetBitrate() const override;
|
| EncodedInfo EncodeInternal(uint32_t rtp_timestamp,
|
| const int16_t* audio,
|
| @@ -50,9 +50,9 @@ class AudioEncoderPcm : public AudioEncoder {
|
| protected:
|
| AudioEncoderPcm(const Config& config, int sample_rate_hz);
|
|
|
| - virtual int16_t EncodeCall(const int16_t* audio,
|
| - size_t input_len,
|
| - uint8_t* encoded) = 0;
|
| + virtual size_t EncodeCall(const int16_t* audio,
|
| + size_t input_len,
|
| + uint8_t* encoded) = 0;
|
|
|
| virtual int BytesPerSample() const = 0;
|
|
|
| @@ -60,7 +60,7 @@ class AudioEncoderPcm : public AudioEncoder {
|
| const int sample_rate_hz_;
|
| const int num_channels_;
|
| const int payload_type_;
|
| - const int num_10ms_frames_per_packet_;
|
| + const size_t num_10ms_frames_per_packet_;
|
| const size_t full_frame_samples_;
|
| std::vector<int16_t> speech_buffer_;
|
| uint32_t first_timestamp_in_buffer_;
|
| @@ -76,9 +76,9 @@ class AudioEncoderPcmA final : public AudioEncoderPcm {
|
| : AudioEncoderPcm(config, kSampleRateHz) {}
|
|
|
| protected:
|
| - int16_t EncodeCall(const int16_t* audio,
|
| - size_t input_len,
|
| - uint8_t* encoded) override;
|
| + size_t EncodeCall(const int16_t* audio,
|
| + size_t input_len,
|
| + uint8_t* encoded) override;
|
|
|
| int BytesPerSample() const override;
|
|
|
| @@ -96,9 +96,9 @@ class AudioEncoderPcmU final : public AudioEncoderPcm {
|
| : AudioEncoderPcm(config, kSampleRateHz) {}
|
|
|
| protected:
|
| - int16_t EncodeCall(const int16_t* audio,
|
| - size_t input_len,
|
| - uint8_t* encoded) override;
|
| + size_t EncodeCall(const int16_t* audio,
|
| + size_t input_len,
|
| + uint8_t* encoded) override;
|
|
|
| int BytesPerSample() const override;
|
|
|
|
|