zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix segmentation fault in AudioEncoderOpusTest.EncodeAtMinBitrate.

Browse Source 
BUG=webrtc:7105

Review-Url: https://codereview.webrtc.org/2733803002
Cr-Commit-Position: refs/heads/master@{#17069}
This commit is contained in:
michaelt
2017-03-06 06:49:27 -08:00
committed by Commit bot
parent d8bd1b1d82
commit e7811f5d69
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
webrtc/modules/audio_coding/codecs/opus/audio_encoder_opus_unittest.cc
View File

@ -125,10 +125,12 @@ std::unique_ptr<test::AudioLoop> Create10msAudioBlocks(
std::unique_ptr<test::AudioLoop> speech_data(new test::AudioLoop()); std::unique_ptr<test::AudioLoop> speech_data(new test::AudioLoop());
int audio_samples_per_ms = int audio_samples_per_ms =
rtc::CheckedDivExact(encoder->SampleRateHz(), 1000); rtc::CheckedDivExact(encoder->SampleRateHz(), 1000);
RTC_DCHECK(speech_data->Init( if (!speech_data->Init(
file_name, file_name,
packet_size_ms * audio_samples_per_ms * encoder->num_channels_to_encode(), packet_size_ms * audio_samples_per_ms *
10 * audio_samples_per_ms * encoder->num_channels_to_encode())); encoder->num_channels_to_encode(),
10 * audio_samples_per_ms * encoder->num_channels_to_encode()))
return nullptr;
return speech_data; return speech_data;
} }
@ -521,6 +523,7 @@ TEST(AudioEncoderOpusTest, EncodeAtMinBitrate) {
constexpr int kNumPacketsToEncode = 2; constexpr int kNumPacketsToEncode = 2;
auto audio_frames = auto audio_frames =
Create10msAudioBlocks(states.encoder, kNumPacketsToEncode * 20); Create10msAudioBlocks(states.encoder, kNumPacketsToEncode * 20);
ASSERT_TRUE(audio_frames) << "Create10msAudioBlocks failed";
rtc::Buffer encoded; rtc::Buffer encoded;
uint32_t rtp_timestamp = 12345; // Just a number not important to this test. uint32_t rtp_timestamp = 12345; // Just a number not important to this test.