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}
104 lines
3.3 KiB
C++
104 lines
3.3 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.
|
|
*/
|
|
|
|
#include "modules/audio_coding/neteq/decision_logic_fax.h"
|
|
|
|
#include <assert.h>
|
|
|
|
#include <algorithm>
|
|
|
|
#include "modules/audio_coding/neteq/decoder_database.h"
|
|
#include "modules/audio_coding/neteq/sync_buffer.h"
|
|
|
|
namespace webrtc {
|
|
|
|
Operations DecisionLogicFax::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*/) {
|
|
assert(playout_mode_ == kPlayoutFax || playout_mode_ == kPlayoutOff);
|
|
uint32_t target_timestamp = sync_buffer.end_timestamp();
|
|
uint32_t available_timestamp = 0;
|
|
int is_cng_packet = 0;
|
|
if (next_packet) {
|
|
available_timestamp = next_packet->timestamp;
|
|
is_cng_packet =
|
|
decoder_database_->IsComfortNoise(next_packet->payload_type);
|
|
}
|
|
if (is_cng_packet) {
|
|
if (static_cast<int32_t>((generated_noise_samples + target_timestamp) -
|
|
available_timestamp) >= 0) {
|
|
// Time to play this packet now.
|
|
return kRfc3389Cng;
|
|
} else {
|
|
// Wait before playing this packet.
|
|
return kRfc3389CngNoPacket;
|
|
}
|
|
}
|
|
if (!next_packet) {
|
|
// No packet. If in CNG mode, play as usual. Otherwise, use other method to
|
|
// generate data.
|
|
if (cng_state_ == kCngRfc3389On) {
|
|
// Continue playing comfort noise.
|
|
return kRfc3389CngNoPacket;
|
|
} else if (cng_state_ == kCngInternalOn) {
|
|
// Continue playing codec-internal comfort noise.
|
|
return kCodecInternalCng;
|
|
} else {
|
|
// Nothing to play. Generate some data to play out.
|
|
switch (playout_mode_) {
|
|
case kPlayoutOff:
|
|
return kAlternativePlc;
|
|
case kPlayoutFax:
|
|
return kAudioRepetition;
|
|
default:
|
|
assert(false);
|
|
return kUndefined;
|
|
}
|
|
}
|
|
} else if (target_timestamp == available_timestamp) {
|
|
return kNormal;
|
|
} else {
|
|
if (static_cast<int32_t>((generated_noise_samples + target_timestamp) -
|
|
available_timestamp) >= 0) {
|
|
return kNormal;
|
|
} else {
|
|
// If currently playing comfort noise, continue with that. Do not
|
|
// increase the timestamp counter since generated_noise_stopwatch_ in
|
|
// NetEqImpl will take care of the time-keeping.
|
|
if (cng_state_ == kCngRfc3389On) {
|
|
return kRfc3389CngNoPacket;
|
|
} else if (cng_state_ == kCngInternalOn) {
|
|
return kCodecInternalCng;
|
|
} else {
|
|
// Otherwise, do packet-loss concealment and increase the
|
|
// timestamp while waiting for the time to play this packet.
|
|
switch (playout_mode_) {
|
|
case kPlayoutOff:
|
|
return kAlternativePlcIncreaseTimestamp;
|
|
case kPlayoutFax:
|
|
return kAudioRepetitionIncreaseTimestamp;
|
|
default:
|
|
assert(0);
|
|
return kUndefined;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
} // namespace webrtc
|