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

Revert "opus: take SILK vad result into account for voice detection"

Browse Source 
This reverts commit 686a3709acfedcf0a4c798dd1c5902787c4a266b.

Reason for revert: crbug.com/1144220

Original change's description:
> opus: take SILK vad result into account for voice detection
>
> BUG=webrtc:11643
>
> Change-Id: Idc3a9b6bb7bd1a33f905843e5d6067ae19d5172c
> Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/176508
> Commit-Queue: Minyue Li <minyue@webrtc.org>
> Reviewed-by: Minyue Li <minyue@webrtc.org>
> Cr-Commit-Position: refs/heads/master@{#31743}

TBR=devicentepena@webrtc.org,minyue@webrtc.org,fippo@sip-communicator.org

Bug: webrtc:11643
Change-Id: I9c77e4f6e919c4b648a5783edf4188e1f8114602
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/191485
Commit-Queue: Minyue Li <minyue@webrtc.org>
Reviewed-by: Minyue Li <minyue@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#32542}
This commit is contained in:
Minyue Li
2020-11-03 23:22:26 +01:00
committed by Commit Bot
parent ddd41919c0
commit c940870b72
5 changed files with 23 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
modules/audio_coding/test/TestVADDTX.cc
View File

@ -166,13 +166,11 @@ void TestVadDtx::Run(std::string in_filename,
int i = &st - stats; // Calculate the current position in stats.
switch (expects[i]) {
case 0: {
EXPECT_EQ(0u, st) << "stats[" << i << "] error. Output file "
<< out_filename;
EXPECT_EQ(0u, st) << "stats[" << i << "] error.";
break;
}
case 1: {
EXPECT_GT(st, 0u) << "stats[" << i << "] error. Output file "
<< out_filename;
EXPECT_GT(st, 0u) << "stats[" << i << "] error.";
break;
}
}
@ -191,29 +189,25 @@ void TestWebRtcVadDtx::Perform() {
// Test various configurations on VAD/DTX.
void TestWebRtcVadDtx::RunTestCases(const SdpAudioFormat& codec_format) {
RegisterCodec(codec_format, absl::nullopt);
Test(/*new_outfile=*/true,
/*expect_vad_packets=*/codec_format.name == "opus");
/*expect_dtx_enabled=*/RegisterCodec(codec_format, absl::nullopt));
RegisterCodec(codec_format, Vad::kVadAggressive);
Test(/*new_outfile=*/false,
/*expect_vad_packets=*/true);
/*expect_dtx_enabled=*/RegisterCodec(codec_format, Vad::kVadAggressive));
RegisterCodec(codec_format, Vad::kVadLowBitrate);
Test(/*new_outfile=*/false,
/*expect_vad_packets=*/true);
/*expect_dtx_enabled=*/RegisterCodec(codec_format, Vad::kVadLowBitrate));
RegisterCodec(codec_format, Vad::kVadVeryAggressive);
Test(/*new_outfile=*/false, /*expect_vad_packets=*/true);
Test(/*new_outfile=*/false, /*expect_dtx_enabled=*/RegisterCodec(
codec_format, Vad::kVadVeryAggressive));
RegisterCodec(codec_format, Vad::kVadNormal);
Test(/*new_outfile=*/false,
/*expect_vad_packets=*/true);
/*expect_dtx_enabled=*/RegisterCodec(codec_format, Vad::kVadNormal));
}
// Set the expectation and run the test.
void TestWebRtcVadDtx::Test(bool new_outfile, bool expect_vad_packets) {
int expects[] = {-1, 1, expect_vad_packets ? 1 : -1, 0, 0};
void TestWebRtcVadDtx::Test(bool new_outfile, bool expect_dtx_enabled) {
int expects[] = {-1, 1, expect_dtx_enabled, 0, 0};
if (new_outfile) {
output_file_num_++;
}
@ -226,20 +220,16 @@ void TestWebRtcVadDtx::Test(bool new_outfile, bool expect_vad_packets) {
// Following is the implementation of TestOpusDtx.
void TestOpusDtx::Perform() {
int expects[] = {0, 0, 0, 0, 0};
int expects[] = {0, 1, 0, 0, 0};
// Register Opus as send codec
std::string out_filename =
webrtc::test::OutputPath() + "testOpusDtx_outFile_mono.pcm";
RegisterCodec({"opus", 48000, 2}, absl::nullopt);
acm_send_->ModifyEncoder([](std::unique_ptr<AudioEncoder>* encoder_ptr) {
(*encoder_ptr)->SetDtx(false);
});
expects[static_cast<int>(AudioFrameType::kEmptyFrame)] = 0;
expects[static_cast<int>(AudioFrameType::kAudioFrameSpeech)] = 1;
expects[static_cast<int>(AudioFrameType::kAudioFrameCN)] = 1;
Run(webrtc::test::ResourcePath("audio_coding/testfile32kHz", "pcm"), 32000, 1,
out_filename, false, expects);
@ -247,7 +237,6 @@ void TestOpusDtx::Perform() {
(*encoder_ptr)->SetDtx(true);
});
expects[static_cast<int>(AudioFrameType::kEmptyFrame)] = 1;
expects[static_cast<int>(AudioFrameType::kAudioFrameSpeech)] = 1;
expects[static_cast<int>(AudioFrameType::kAudioFrameCN)] = 1;
Run(webrtc::test::ResourcePath("audio_coding/testfile32kHz", "pcm"), 32000, 1,
out_filename, true, expects);
@ -255,12 +244,10 @@ void TestOpusDtx::Perform() {
// Register stereo Opus as send codec
out_filename = webrtc::test::OutputPath() + "testOpusDtx_outFile_stereo.pcm";
RegisterCodec({"opus", 48000, 2, {{"stereo", "1"}}}, absl::nullopt);
acm_send_->ModifyEncoder([](std::unique_ptr<AudioEncoder>* encoder_ptr) {
(*encoder_ptr)->SetDtx(false);
});
expects[static_cast<int>(AudioFrameType::kEmptyFrame)] = 0;
expects[static_cast<int>(AudioFrameType::kAudioFrameSpeech)] = 1;
expects[static_cast<int>(AudioFrameType::kAudioFrameCN)] = 0;
Run(webrtc::test::ResourcePath("audio_coding/teststereo32kHz", "pcm"), 32000,
2, out_filename, false, expects);
@ -274,7 +261,6 @@ void TestOpusDtx::Perform() {
});
expects[static_cast<int>(AudioFrameType::kEmptyFrame)] = 1;
expects[static_cast<int>(AudioFrameType::kAudioFrameSpeech)] = 1;
expects[static_cast<int>(AudioFrameType::kAudioFrameCN)] = 1;
Run(webrtc::test::ResourcePath("audio_coding/teststereo32kHz", "pcm"), 32000,
2, out_filename, true, expects);