Ignoring revisions in .git-blame-ignore-revs. Click here to bypass and see the normal blame view.

70 lines
2.2 KiB
C
Raw Permalink Normal View History

/*
* 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_DELAY_MANAGER_H_
#define MODULES_AUDIO_CODING_NETEQ_DELAY_MANAGER_H_
#include <memory>
#include <optional>
#include "api/field_trials_view.h"
#include "api/neteq/tick_timer.h"
#include "modules/audio_coding/neteq/reorder_optimizer.h"
#include "modules/audio_coding/neteq/underrun_optimizer.h"
namespace webrtc {
class DelayManager {
public:
struct Config {
explicit Config(const FieldTrialsView& field_trials);
void Log();
// Options that can be configured via field trial.
double quantile = 0.95;
double forget_factor = 0.983;
std::optional<double> start_forget_weight = 2;
std::optional<int> resample_interval_ms = 500;
bool use_reorder_optimizer = true;
double reorder_forget_factor = 0.9993;
int ms_per_loss_percent = 20;
};
DelayManager(const Config& config, const TickTimer* tick_timer);
virtual ~DelayManager();
DelayManager(const DelayManager&) = delete;
DelayManager& operator=(const DelayManager&) = delete;
// Updates the delay manager that a new packet arrived with delay
// `arrival_delay_ms`. This updates the statistics and a new target buffer
// level is calculated. The `reordered` flag indicates if the packet was
// reordered.
virtual void Update(int arrival_delay_ms, bool reordered);
2020-10-09 13:41:06 +02:00
// Resets all state.
virtual void Reset();
// Gets the target buffer level in milliseconds. If a minimum or maximum delay
// has been set, the target delay reported here also respects the configured
// min/max delay.
2020-10-09 13:41:06 +02:00
virtual int TargetDelayMs() const;
Revert "Reland "Refactor NetEq delay manager logic."" This reverts commit 2a7c57c34f323ee1977f6e7809ee23bfcf9a7459. Reason for revert: unexpected big changes in behavior. Original change's description: > Reland "Refactor NetEq delay manager logic." > > This is a reland of f8e62fcb14e37a5be4f1e4f599d34c8483fea8e9 > > Original change's description: > > Refactor NetEq delay manager logic. > > > > - Removes dependence on sequence number for calculating target delay. > > - Changes target delay unit to milliseconds instead of number of > > packets. > > - Moves acceleration/preemptive expand thresholds to decision logic. > > Tests for this will be added in a follow up cl. > > > > Bug: webrtc:10333 > > Change-Id: If690aae4abf41ef1d9353f0ff01fb7d121cf8a26 > > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/186265 > > Commit-Queue: Jakob Ivarsson <jakobi@webrtc.org> > > Reviewed-by: Ivo Creusen <ivoc@webrtc.org> > > Cr-Commit-Position: refs/heads/master@{#32326} > > Bug: webrtc:10333 > Change-Id: Iad5e7063f63b84762959ee5b412f5f14a7b2cd06 > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/186943 > Commit-Queue: Jakob Ivarsson <jakobi@webrtc.org> > Reviewed-by: Ivo Creusen <ivoc@webrtc.org> > Cr-Commit-Position: refs/heads/master@{#32332} TBR=ivoc@webrtc.org,jakobi@webrtc.org Change-Id: Iffda0e8a7b647392d8dfc6724d49439fa13d71b2 No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: webrtc:10333 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/187100 Reviewed-by: Jakob Ivarsson <jakobi@webrtc.org> Commit-Queue: Jakob Ivarsson <jakobi@webrtc.org> Cr-Commit-Position: refs/heads/master@{#32341}
2020-10-07 12:46:42 +00:00
private:
UnderrunOptimizer underrun_optimizer_;
std::unique_ptr<ReorderOptimizer> reorder_optimizer_;
int target_level_ms_ = 0; // Currently preferred buffer level.
};
} // namespace webrtc
#endif // MODULES_AUDIO_CODING_NETEQ_DELAY_MANAGER_H_