Skip to content

Commit c31a4ec

Browse files
Ivo CreusenCommit Bot
Ivo Creusen
authored and
Commit Bot
committed
Disable opus tests to allow upgrade to opus 1.3
The upgrade to opus 1.3 is easier to carry out while the opus bitexactness tests are temporarily disabled. Bug: webrtc:11325 Change-Id: I96eecdbc93a01da88b92ae7f6473034c9795f3a0 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/167726 Commit-Queue: Ivo Creusen <ivoc@webrtc.org> Reviewed-by: Sam Zackrisson <saza@webrtc.org> Cr-Commit-Position: refs/heads/master@{#30425}
1 parent bef818d commit c31a4ec

File tree

5 files changed

+22
-11
lines changed

5 files changed

+22
-11
lines changed

modules/audio_coding/acm2/audio_coding_module_unittest.cc

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1455,13 +1455,15 @@ const std::string payload_checksum =
14551455
"27fef7b799393347ec3b5694369a1c36");
14561456
} // namespace
14571457

1458-
TEST_F(AcmSenderBitExactnessOldApi, Opus_stereo_20ms) {
1458+
// TODO(webrtc:11325) Reenable after Opus has been upgraded to 1.3.
1459+
TEST_F(AcmSenderBitExactnessOldApi, DISABLED_Opus_stereo_20ms) {
14591460
ASSERT_NO_FATAL_FAILURE(SetUpTest("opus", 48000, 2, 120, 960, 960));
14601461
Run(audio_checksum, payload_checksum, 50,
14611462
test::AcmReceiveTestOldApi::kStereoOutput);
14621463
}
14631464

1464-
TEST_F(AcmSenderBitExactnessNewApi, MAYBE_OpusFromFormat_stereo_20ms) {
1465+
// TODO(webrtc:11325) Reenable after Opus has been upgraded to 1.3.
1466+
TEST_F(AcmSenderBitExactnessNewApi, DISABLED_OpusFromFormat_stereo_20ms) {
14651467
const auto config = AudioEncoderOpus::SdpToConfig(
14661468
SdpAudioFormat("opus", 48000, 2, {{"stereo", "1"}}));
14671469
ASSERT_TRUE(SetUpSender(kTestFileFakeStereo32kHz, 32000));
@@ -1518,7 +1520,8 @@ TEST_F(AcmSenderBitExactnessNewApi, DISABLED_OpusManyChannels) {
15181520
50, test::AcmReceiveTestOldApi::kQuadOutput, decoder_factory);
15191521
}
15201522

1521-
TEST_F(AcmSenderBitExactnessNewApi, OpusFromFormat_stereo_20ms_voip) {
1523+
// TODO(webrtc:11325) Reenable after Opus has been upgraded to 1.3.
1524+
TEST_F(AcmSenderBitExactnessNewApi, DISABLED_OpusFromFormat_stereo_20ms_voip) {
15221525
auto config = AudioEncoderOpus::SdpToConfig(
15231526
SdpAudioFormat("opus", 48000, 2, {{"stereo", "1"}}));
15241527
// If not set, default will be kAudio in case of stereo.
@@ -1618,7 +1621,8 @@ class AcmSetBitRateNewApi : public AcmSetBitRateTest {
16181621
}
16191622
};
16201623

1621-
TEST_F(AcmSetBitRateNewApi, OpusFromFormat_48khz_20ms_10kbps) {
1624+
// TODO(webrtc:11325) Reenable after Opus has been upgraded to 1.3.
1625+
TEST_F(AcmSetBitRateNewApi, DISABLED_OpusFromFormat_48khz_20ms_10kbps) {
16221626
const auto config = AudioEncoderOpus::SdpToConfig(
16231627
SdpAudioFormat("opus", 48000, 2, {{"maxaveragebitrate", "10000"}}));
16241628
ASSERT_TRUE(SetUpSender());
@@ -1627,7 +1631,8 @@ TEST_F(AcmSetBitRateNewApi, OpusFromFormat_48khz_20ms_10kbps) {
16271631
RunInner(8000, 12000);
16281632
}
16291633

1630-
TEST_F(AcmSetBitRateNewApi, OpusFromFormat_48khz_20ms_50kbps) {
1634+
// TODO(webrtc:11325) Reenable after Opus has been upgraded to 1.3.
1635+
TEST_F(AcmSetBitRateNewApi, DISABLED_OpusFromFormat_48khz_20ms_50kbps) {
16311636
const auto config = AudioEncoderOpus::SdpToConfig(
16321637
SdpAudioFormat("opus", 48000, 2, {{"maxaveragebitrate", "50000"}}));
16331638
ASSERT_TRUE(SetUpSender());
@@ -1735,7 +1740,8 @@ TEST_F(AudioCodingModuleTestOldApi, SendingMonoForStereoInput) {
17351740
#define MAYBE_OpusFromFormat_48khz_20ms_100kbps \
17361741
OpusFromFormat_48khz_20ms_100kbps
17371742
#endif
1738-
TEST_F(AcmSetBitRateNewApi, MAYBE_OpusFromFormat_48khz_20ms_100kbps) {
1743+
// TODO(webrtc:11325) Reenable after Opus has been upgraded to 1.3.
1744+
TEST_F(AcmSetBitRateNewApi, DISABLED_OpusFromFormat_48khz_20ms_100kbps) {
17391745
const auto config = AudioEncoderOpus::SdpToConfig(
17401746
SdpAudioFormat("opus", 48000, 2, {{"maxaveragebitrate", "100000"}}));
17411747
ASSERT_TRUE(SetUpSender());

modules/audio_coding/codecs/opus/audio_encoder_opus_unittest.cc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -912,7 +912,8 @@ TEST(AudioEncoderOpusTest, SetMaxPlaybackRateFb) {
912912
EXPECT_EQ(64000, config.bitrate_bps);
913913
}
914914

915-
TEST_P(AudioEncoderOpusTest, OpusFlagDtxAsNonSpeech) {
915+
// TODO(webrtc:11325) Reenable after Opus has been upgraded to 1.3.
916+
TEST_P(AudioEncoderOpusTest, DISABLED_OpusFlagDtxAsNonSpeech) {
916917
// Create encoder with DTX enabled.
917918
AudioEncoderOpusConfig config;
918919
config.dtx_enabled = true;

modules/audio_coding/codecs/opus/opus_bandwidth_unittest.cc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,8 @@ float EncodedPowerRatio(AudioEncoder* encoder,
101101

102102
} // namespace
103103

104-
TEST(BandwidthAdaptationTest, BandwidthAdaptationTest) {
104+
// TODO(webrtc:11325) Reenable after Opus has been upgraded to 1.3.
105+
TEST(BandwidthAdaptationTest, DISABLED_BandwidthAdaptationTest) {
105106
test::ScopedFieldTrials override_field_trials(
106107
"WebRTC-AdjustOpusBandwidth/Enabled/");
107108

modules/audio_coding/neteq/audio_decoder_unittest.cc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -599,7 +599,8 @@ TEST_F(AudioDecoderG722StereoTest, SetTargetBitrate) {
599599
TestSetAndGetTargetBitratesWithFixedCodec(audio_encoder_.get(), 128000);
600600
}
601601

602-
TEST_P(AudioDecoderOpusTest, EncodeDecode) {
602+
// TODO(webrtc:11325) Reenable after Opus has been upgraded to 1.3.
603+
TEST_P(AudioDecoderOpusTest, DISABLED_EncodeDecode) {
603604
constexpr int tolerance = 6176;
604605
const int channel_diff_tolerance = opus_sample_rate_hz_ == 16000 ? 6 : 0;
605606
constexpr double mse = 238630.0;

modules/audio_coding/neteq/neteq_unittest.cc

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,8 @@ TEST_F(NetEqDecodingTest, MAYBE_TestBitExactness) {
105105
#else
106106
#define MAYBE_TestOpusBitExactness DISABLED_TestOpusBitExactness
107107
#endif
108-
TEST_F(NetEqDecodingTest, MAYBE_TestOpusBitExactness) {
108+
// TODO(webrtc:11325) Reenable after Opus has been upgraded to 1.3.
109+
TEST_F(NetEqDecodingTest, DISABLED_TestOpusBitExactness) {
109110
const std::string input_rtp_file =
110111
webrtc::test::ResourcePath("audio_coding/neteq_opus", "rtp");
111112

@@ -134,7 +135,8 @@ TEST_F(NetEqDecodingTest, MAYBE_TestOpusBitExactness) {
134135
#else
135136
#define MAYBE_TestOpusDtxBitExactness DISABLED_TestOpusDtxBitExactness
136137
#endif
137-
TEST_F(NetEqDecodingTest, MAYBE_TestOpusDtxBitExactness) {
138+
// TODO(webrtc:11325) Reenable after Opus has been upgraded to 1.3.
139+
TEST_F(NetEqDecodingTest, DISABLED_TestOpusDtxBitExactness) {
138140
const std::string input_rtp_file =
139141
webrtc::test::ResourcePath("audio_coding/neteq_opus_dtx", "rtp");
140142

0 commit comments

Comments
 (0)