1ff41eb784
This reverts commit 80c4cca4915dbc6094a5bfae749f85f7371eadd1. Reason for revert: Breaks downstream tests. Original change's description: > 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} TBR=henrik.lundin@webrtc.org,ivoc@webrtc.org,minyue@webrtc.org Change-Id: I555aae8850fc4ac1ea919bfa72c11b5218066f30 No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: webrtc:9421 Reviewed-on: https://webrtc-review.googlesource.com/84680 Reviewed-by: Henrik Lundin <henrik.lundin@webrtc.org> Commit-Queue: Henrik Lundin <henrik.lundin@webrtc.org> Cr-Commit-Position: refs/heads/master@{#23706}
53 lines
1.2 KiB
C++
53 lines
1.2 KiB
C++
/*
|
|
* Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
|
|
*
|
|
* Use of this source code is governed by a BSD-style license
|
|
* that can be found in the LICENSE file in the root of the source
|
|
* tree. An additional intellectual property rights grant can be found
|
|
* in the file PATENTS. All contributing project authors may
|
|
* be found in the AUTHORS file in the root of the source tree.
|
|
*/
|
|
|
|
#ifndef MODULES_AUDIO_CODING_NETEQ_DEFINES_H_
|
|
#define MODULES_AUDIO_CODING_NETEQ_DEFINES_H_
|
|
|
|
namespace webrtc {
|
|
|
|
enum Operations {
|
|
kNormal = 0,
|
|
kMerge,
|
|
kExpand,
|
|
kAccelerate,
|
|
kFastAccelerate,
|
|
kPreemptiveExpand,
|
|
kRfc3389Cng,
|
|
kRfc3389CngNoPacket,
|
|
kCodecInternalCng,
|
|
kDtmf,
|
|
kAlternativePlc,
|
|
kAlternativePlcIncreaseTimestamp,
|
|
kAudioRepetition,
|
|
kAudioRepetitionIncreaseTimestamp,
|
|
kUndefined = -1
|
|
};
|
|
|
|
enum Modes {
|
|
kModeNormal = 0,
|
|
kModeExpand,
|
|
kModeMerge,
|
|
kModeAccelerateSuccess,
|
|
kModeAccelerateLowEnergy,
|
|
kModeAccelerateFail,
|
|
kModePreemptiveExpandSuccess,
|
|
kModePreemptiveExpandLowEnergy,
|
|
kModePreemptiveExpandFail,
|
|
kModeRfc3389Cng,
|
|
kModeCodecInternalCng,
|
|
kModeDtmf,
|
|
kModeError,
|
|
kModeUndefined = -1
|
|
};
|
|
|
|
} // namespace webrtc
|
|
#endif // MODULES_AUDIO_CODING_NETEQ_DEFINES_H_
|