diff options
Diffstat (limited to 'webrtc/modules/audio_coding/codecs/red')
3 files changed, 14 insertions, 13 deletions
diff --git a/webrtc/modules/audio_coding/codecs/red/audio_encoder_copy_red.cc b/webrtc/modules/audio_coding/codecs/red/audio_encoder_copy_red.cc index a19d194e59..7ef1ce096b 100644 --- a/webrtc/modules/audio_coding/codecs/red/audio_encoder_copy_red.cc +++ b/webrtc/modules/audio_coding/codecs/red/audio_encoder_copy_red.cc @@ -32,7 +32,7 @@ int AudioEncoderCopyRed::SampleRateHz() const { return speech_encoder_->SampleRateHz(); } -int AudioEncoderCopyRed::NumChannels() const { +size_t AudioEncoderCopyRed::NumChannels() const { return speech_encoder_->NumChannels(); } @@ -54,12 +54,11 @@ int AudioEncoderCopyRed::GetTargetBitrate() const { AudioEncoder::EncodedInfo AudioEncoderCopyRed::EncodeInternal( uint32_t rtp_timestamp, - const int16_t* audio, + rtc::ArrayView<const int16_t> audio, size_t max_encoded_bytes, uint8_t* encoded) { - EncodedInfo info = speech_encoder_->Encode( - rtp_timestamp, audio, static_cast<size_t>(SampleRateHz() / 100), - max_encoded_bytes, encoded); + EncodedInfo info = + speech_encoder_->Encode(rtp_timestamp, audio, max_encoded_bytes, encoded); RTC_CHECK_GE(max_encoded_bytes, info.encoded_bytes + secondary_info_.encoded_bytes); RTC_CHECK(info.redundant.empty()) << "Cannot use nested redundant encoders."; diff --git a/webrtc/modules/audio_coding/codecs/red/audio_encoder_copy_red.h b/webrtc/modules/audio_coding/codecs/red/audio_encoder_copy_red.h index 7837010605..2f53765389 100644 --- a/webrtc/modules/audio_coding/codecs/red/audio_encoder_copy_red.h +++ b/webrtc/modules/audio_coding/codecs/red/audio_encoder_copy_red.h @@ -38,13 +38,13 @@ class AudioEncoderCopyRed final : public AudioEncoder { size_t MaxEncodedBytes() const override; int SampleRateHz() const override; - int NumChannels() const override; + size_t NumChannels() const override; int RtpTimestampRateHz() 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, + rtc::ArrayView<const int16_t> audio, size_t max_encoded_bytes, uint8_t* encoded) override; void Reset() override; diff --git a/webrtc/modules/audio_coding/codecs/red/audio_encoder_copy_red_unittest.cc b/webrtc/modules/audio_coding/codecs/red/audio_encoder_copy_red_unittest.cc index cb50652183..22601b6597 100644 --- a/webrtc/modules/audio_coding/codecs/red/audio_encoder_copy_red_unittest.cc +++ b/webrtc/modules/audio_coding/codecs/red/audio_encoder_copy_red_unittest.cc @@ -42,7 +42,7 @@ class AudioEncoderCopyRedTest : public ::testing::Test { config.speech_encoder = &mock_encoder_; red_.reset(new AudioEncoderCopyRed(config)); memset(audio_, 0, sizeof(audio_)); - EXPECT_CALL(mock_encoder_, NumChannels()).WillRepeatedly(Return(1)); + EXPECT_CALL(mock_encoder_, NumChannels()).WillRepeatedly(Return(1U)); EXPECT_CALL(mock_encoder_, SampleRateHz()) .WillRepeatedly(Return(sample_rate_hz_)); EXPECT_CALL(mock_encoder_, MaxEncodedBytes()) @@ -60,8 +60,10 @@ class AudioEncoderCopyRedTest : public ::testing::Test { void Encode() { ASSERT_TRUE(red_.get() != NULL); - encoded_info_ = red_->Encode(timestamp_, audio_, num_audio_samples_10ms, - encoded_.size(), &encoded_[0]); + encoded_info_ = red_->Encode( + timestamp_, + rtc::ArrayView<const int16_t>(audio_, num_audio_samples_10ms), + encoded_.size(), &encoded_[0]); timestamp_ += num_audio_samples_10ms; } @@ -83,7 +85,7 @@ class MockEncodeHelper { } AudioEncoder::EncodedInfo Encode(uint32_t timestamp, - const int16_t* audio, + rtc::ArrayView<const int16_t> audio, size_t max_encoded_bytes, uint8_t* encoded) { if (write_payload_) { @@ -108,8 +110,8 @@ TEST_F(AudioEncoderCopyRedTest, CheckSampleRatePropagation) { } TEST_F(AudioEncoderCopyRedTest, CheckNumChannelsPropagation) { - EXPECT_CALL(mock_encoder_, NumChannels()).WillOnce(Return(17)); - EXPECT_EQ(17, red_->NumChannels()); + EXPECT_CALL(mock_encoder_, NumChannels()).WillOnce(Return(17U)); + EXPECT_EQ(17U, red_->NumChannels()); } TEST_F(AudioEncoderCopyRedTest, CheckFrameSizePropagation) { |