From 8dd16259287f58f9273002717ec4d27e97127719 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Wed, 12 Jun 2024 07:43:14 +0200 Subject: Merging upstream version 127.0. Signed-off-by: Daniel Baumann --- third_party/libwebrtc/api/neteq/neteq.cc | 3 +-- third_party/libwebrtc/api/neteq/neteq.h | 31 +++++++++++-------------------- 2 files changed, 12 insertions(+), 22 deletions(-) (limited to 'third_party/libwebrtc/api/neteq') diff --git a/third_party/libwebrtc/api/neteq/neteq.cc b/third_party/libwebrtc/api/neteq/neteq.cc index 155ddf2cf3..d237def23a 100644 --- a/third_party/libwebrtc/api/neteq/neteq.cc +++ b/third_party/libwebrtc/api/neteq/neteq.cc @@ -24,8 +24,7 @@ NetEq::Config& NetEq::Config::operator=(Config&&) = default; std::string NetEq::Config::ToString() const { char buf[1024]; rtc::SimpleStringBuilder ss(buf); - ss << "sample_rate_hz=" << sample_rate_hz << ", enable_post_decode_vad=" - << (enable_post_decode_vad ? "true" : "false") + ss << "sample_rate_hz=" << sample_rate_hz << ", max_packets_in_buffer=" << max_packets_in_buffer << ", min_delay_ms=" << min_delay_ms << ", enable_fast_accelerate=" << (enable_fast_accelerate ? "true" : "false") diff --git a/third_party/libwebrtc/api/neteq/neteq.h b/third_party/libwebrtc/api/neteq/neteq.h index 43e0e09784..3dfe662741 100644 --- a/third_party/libwebrtc/api/neteq/neteq.h +++ b/third_party/libwebrtc/api/neteq/neteq.h @@ -130,7 +130,6 @@ class NetEq { std::string ToString() const; int sample_rate_hz = 48000; // Initial value. Will change with input data. - bool enable_post_decode_vad = false; size_t max_packets_in_buffer = 200; int max_delay_ms = 0; int min_delay_ms = 0; @@ -197,18 +196,17 @@ class NetEq { // Instructs NetEq to deliver 10 ms of audio data. The data is written to // `audio_frame`. All data in `audio_frame` is wiped; `data_`, `speech_type_`, - // `num_channels_`, `sample_rate_hz_`, `samples_per_channel_`, and - // `vad_activity_` are updated upon success. If an error is returned, some - // fields may not have been updated, or may contain inconsistent values. - // If muted state is enabled (through Config::enable_muted_state), `muted` - // may be set to true after a prolonged expand period. When this happens, the - // `data_` in `audio_frame` is not written, but should be interpreted as being - // all zeros. For testing purposes, an override can be supplied in the - // `action_override` argument, which will cause NetEq to take this action - // next, instead of the action it would normally choose. An optional output - // argument for fetching the current sample rate can be provided, which - // will return the same value as last_output_sample_rate_hz() but will avoid - // additional synchronization. + // `num_channels_`, `sample_rate_hz_` and `samples_per_channel_` are updated + // upon success. If an error is returned, some fields may not have been + // updated, or may contain inconsistent values. If muted state is enabled + // (through Config::enable_muted_state), `muted` may be set to true after a + // prolonged expand period. When this happens, the `data_` in `audio_frame` + // is not written, but should be interpreted as being all zeros. For testing + // purposes, an override can be supplied in the `action_override` argument, + // which will cause NetEq to take this action next, instead of the action it + // would normally choose. An optional output argument for fetching the current + // sample rate can be provided, which will return the same value as + // last_output_sample_rate_hz() but will avoid additional synchronization. // Returns kOK on success, or kFail in case of an error. virtual int GetAudio( AudioFrame* audio_frame, @@ -278,13 +276,6 @@ class NetEq { // statistics are never reset. virtual NetEqOperationsAndState GetOperationsAndState() const = 0; - // Enables post-decode VAD. When enabled, GetAudio() will return - // kOutputVADPassive when the signal contains no speech. - virtual void EnableVad() = 0; - - // Disables post-decode VAD. - virtual void DisableVad() = 0; - // Returns the RTP timestamp for the last sample delivered by GetAudio(). // The return value will be empty if no valid timestamp is available. virtual absl::optional GetPlayoutTimestamp() const = 0; -- cgit v1.2.3