NetEq: Deprecate playout modes Fax, Off and Streaming
The playout modes other than Normal have not been reachable for a long time, other than through tests. It is time to deprecate them. The only meaningful use was that Fax mode was sometimes set from tests, in order to avoid time-stretching operations (accelerate and pre-emptive expand) from messing with the test results. With this CL, a new config is added instead, which lets the user specify exactly this: don't do time-stretching. As a result of Fax and Off modes being removed, the following code clean-up was done: - Fold DecisionLogicNormal into DecisionLogic. - Remove AudioRepetition and AlternativePlc operations, since they can no longer be reached. Bug: webrtc:9421 Change-Id: I651458e9c1931a99f3b07e242817d303bac119df Reviewed-on: https://webrtc-review.googlesource.com/84123 Commit-Queue: Henrik Lundin <henrik.lundin@webrtc.org> Reviewed-by: Ivo Creusen <ivoc@webrtc.org> Reviewed-by: Minyue Li <minyue@webrtc.org> Cr-Commit-Position: refs/heads/master@{#23704}
This commit is contained in:
committed by
Commit Bot
parent
c0260b4f2b
commit
80c4cca491
@ -1377,32 +1377,6 @@ class NetEqImplTest120ms : public NetEqImplTest {
|
||||
uint16_t sequence_number_ = 1;
|
||||
};
|
||||
|
||||
TEST_F(NetEqImplTest120ms, AudioRepetition) {
|
||||
config_.playout_mode = kPlayoutFax;
|
||||
CreateInstanceNoMocks();
|
||||
Register120msCodec(AudioDecoder::kSpeech);
|
||||
|
||||
InsertPacket(first_timestamp());
|
||||
GetFirstPacket();
|
||||
|
||||
bool muted;
|
||||
EXPECT_EQ(NetEq::kOK, neteq_->GetAudio(&output_, &muted));
|
||||
EXPECT_EQ(kAudioRepetition, neteq_->last_operation_for_test());
|
||||
}
|
||||
|
||||
TEST_F(NetEqImplTest120ms, AlternativePlc) {
|
||||
config_.playout_mode = kPlayoutOff;
|
||||
CreateInstanceNoMocks();
|
||||
Register120msCodec(AudioDecoder::kSpeech);
|
||||
|
||||
InsertPacket(first_timestamp());
|
||||
GetFirstPacket();
|
||||
|
||||
bool muted;
|
||||
EXPECT_EQ(NetEq::kOK, neteq_->GetAudio(&output_, &muted));
|
||||
EXPECT_EQ(kAlternativePlc, neteq_->last_operation_for_test());
|
||||
}
|
||||
|
||||
TEST_F(NetEqImplTest120ms, CodecInternalCng) {
|
||||
CreateInstanceNoMocks();
|
||||
Register120msCodec(AudioDecoder::kComfortNoise);
|
||||
|
||||
Reference in New Issue
Block a user