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}
59 lines
2.2 KiB
C++
59 lines
2.2 KiB
C++
/*
|
|
* Copyright (c) 2013 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_DECISION_LOGIC_FAX_H_
|
|
#define MODULES_AUDIO_CODING_NETEQ_DECISION_LOGIC_FAX_H_
|
|
|
|
#include "modules/audio_coding/neteq/decision_logic.h"
|
|
#include "rtc_base/constructormagic.h"
|
|
#include "typedefs.h" // NOLINT(build/include)
|
|
|
|
namespace webrtc {
|
|
|
|
// Implementation of the DecisionLogic class for playout modes kPlayoutFax and
|
|
// kPlayoutOff.
|
|
class DecisionLogicFax : public DecisionLogic {
|
|
public:
|
|
// Constructor.
|
|
DecisionLogicFax(int fs_hz,
|
|
size_t output_size_samples,
|
|
NetEqPlayoutMode playout_mode,
|
|
DecoderDatabase* decoder_database,
|
|
const PacketBuffer& packet_buffer,
|
|
DelayManager* delay_manager,
|
|
BufferLevelFilter* buffer_level_filter,
|
|
const TickTimer* tick_timer)
|
|
: DecisionLogic(fs_hz,
|
|
output_size_samples,
|
|
playout_mode,
|
|
decoder_database,
|
|
packet_buffer,
|
|
delay_manager,
|
|
buffer_level_filter,
|
|
tick_timer) {}
|
|
|
|
protected:
|
|
Operations GetDecisionSpecialized(const SyncBuffer& sync_buffer,
|
|
const Expand& expand,
|
|
size_t decoder_frame_length,
|
|
const Packet* next_packet,
|
|
Modes prev_mode,
|
|
bool play_dtmf,
|
|
bool* reset_decoder,
|
|
size_t generated_noise_samples,
|
|
size_t cur_size_samples) override;
|
|
|
|
private:
|
|
RTC_DISALLOW_COPY_AND_ASSIGN(DecisionLogicFax);
|
|
};
|
|
|
|
} // namespace webrtc
|
|
#endif // MODULES_AUDIO_CODING_NETEQ_DECISION_LOGIC_FAX_H_
|